diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
| commit | df88e41a572b1c67877cf96b5cbb3b4a792d5e16 (patch) | |
| tree | 1194bf621eac69339c2be426c2dd2ff618f99733 | |
| parent | 4b874d7bf2f834d8d6685a85e9578eec8f518b1f (diff) | |
| parent | 318df0840a52a623274b05dea1fa8503f8d0767b (diff) | |
CWS gnumake: resync to m91; conflicts unresolved
554 files changed, 11425 insertions, 9344 deletions
diff --git a/UnoControls/prj/d.lst b/UnoControls/prj/d.lst index 5f65d3c80..370fc0c9f 100644 --- a/UnoControls/prj/d.lst +++ b/UnoControls/prj/d.lst @@ -3,3 +3,4 @@ ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib +..\%__SRC%\misc\ctl.component %_DEST%\xml%_EXT%\ctl.component diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx index 50ce3eb87..3eaf3a7d9 100644 --- a/UnoControls/source/base/registercontrols.cxx +++ b/UnoControls/source/base/registercontrols.cxx @@ -93,59 +93,6 @@ using namespace ::com::sun::star::registry ; } //****************************************************************************************************************************** -#define COMPONENT_INFO(CLASS) \ - \ - AS_DBG_OUT ( "\tCOMPONENT_INFO():\t[start]\n" ) \ - try \ - { \ - /* Set default result of follow operations !!! */ \ - bReturn = sal_False ; \ - \ - /* Do the follow only, if given key is valid ! */ \ - if ( xKey.is () ) \ - { \ - AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txkey is valid ...\n" ) \ - /* Build new keyname */ \ - sKeyName = OUString::createFromAscii( "/" ) ; \ - sKeyName += CLASS::impl_getStaticImplementationName() ; \ - sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); \ - \ - /* Create new key with new name. */ \ - xNewKey = xKey->createKey( sKeyName ); \ - \ - /* If this new key valid ... */ \ - if ( xNewKey.is () ) \ - { \ - AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txNewkey is valid ...\n" ) \ - /* Get information about supported services. */ \ - seqServiceNames = CLASS::impl_getStaticSupportedServiceNames() ; \ - pArray = seqServiceNames.getArray() ; \ - nLength = seqServiceNames.getLength() ; \ - nCounter = 0 ; \ - \ - AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\tloop ..." ) \ - /* Then set this information on this key. */ \ - for ( nCounter = 0; nCounter < nLength; ++nCounter ) \ - { \ - xNewKey->createKey( pArray [nCounter] ); \ - } \ - AS_DBG_OUT ( " OK\n" ) \ - \ - /* Result of this operations = OK. */ \ - bReturn = sal_True ; \ - } \ - AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\t... leave xNewKey\n" ) \ - } \ - AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\t... leave xKey\n" ) \ - } \ - catch( InvalidRegistryException& ) \ - { \ - AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\tInvalidRegistryException detected!!!\n" ) \ - bReturn = sal_False ; \ - } \ - AS_DBG_OUT ( "\tCOMPONENT_INFO():\t[end]\n" ) - -//****************************************************************************************************************************** #define CREATEFACTORY_ONEINSTANCE(CLASS) \ \ AS_DBG_OUT ( "\tCREATEFACTORY_ONEINSTANCE():\t[start]\n" ) \ @@ -218,53 +165,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char* } //______________________________________________________________________________________________________________ -// write component info to registry -//______________________________________________________________________________________________________________ - -extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/ , - void* pRegistryKey ) -{ - AS_DBG_OUT ( "component_writeInfo():\t[start]\n" ) - - // Set default return value for this operation - if it failed. - sal_Bool bReturn = sal_False ; - - if ( pRegistryKey != NULL ) - { - AS_DBG_OUT ( "component_writeInfo():\t\tpRegistryKey is valid ... enter scope\n" ) - - // Define variables for following macros! - // bReturn is set automaticly. - Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ; - Reference< XRegistryKey > xNewKey ; - Sequence< OUString > seqServiceNames ; - const OUString* pArray ; - sal_Int32 nLength ; - sal_Int32 nCounter ; - OUString sKeyName ; - - //============================================================================= - // Add new macro line to register new services. - // - // !!! ATTENTION !!! - // Write no ";" at end of line! (see macro) - //============================================================================= - COMPONENT_INFO ( FrameControl ) - COMPONENT_INFO ( ProgressBar ) - COMPONENT_INFO ( ProgressMonitor ) - COMPONENT_INFO ( StatusIndicator ) - //============================================================================= - - AS_DBG_OUT ( "component_writeInfo():\t\t... leave pRegistryKey scope\n" ) - } - - AS_DBG_OUT ( "component_writeInfo():\t[end]\n" ) - - // Return with result of this operation. - return bReturn ; -} - -//______________________________________________________________________________________________________________ // create right component factory //______________________________________________________________________________________________________________ diff --git a/UnoControls/util/ctl.component b/UnoControls/util/ctl.component new file mode 100644 index 000000000..32901f529 --- /dev/null +++ b/UnoControls/util/ctl.component @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="stardiv.UnoControls.FrameControl"> + <service name="com.sun.star.frame.FrameControl"/> + </implementation> + <implementation name="stardiv.UnoControls.ProgressBar"> + <service name="com.sun.star.awt.XProgressBar"/> + </implementation> + <implementation name="stardiv.UnoControls.ProgressMonitor"> + <service name="com.sun.star.awt.XProgressMonitor"/> + </implementation> + <implementation name="stardiv.UnoControls.StatusIndicator"> + <service name="com.sun.star.task.XStatusIndicator"/> + </implementation> +</component> diff --git a/UnoControls/util/makefile.mk b/UnoControls/util/makefile.mk index aacddb23c..73617d244 100644 --- a/UnoControls/util/makefile.mk +++ b/UnoControls/util/makefile.mk @@ -59,3 +59,11 @@ SHL1LIBS= $(LIB1TARGET) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/ctl.component + +$(MISC)/ctl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ctl.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ctl.component diff --git a/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java b/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java index a5b230cd7..e881dffce 100755 --- a/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java +++ b/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java @@ -142,11 +142,6 @@ public class AccessBridge { return xSingleServiceFactory; } - public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) { - return FactoryHelper.writeRegistryServiceInfo(AccessBridge.class.getName(), - _AccessBridge._serviceName, regKey); - } - static public class _AccessBridge implements XTopWindowListener, XInitialization, XComponent { static final String _serviceName = "com.sun.star.accessibility.AccessBridge"; diff --git a/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component b/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component new file mode 100644 index 000000000..5fc897f2d --- /dev/null +++ b/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Java2" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="org.openoffice.accessibility.AccessBridge"> + <service name="com.sun.star.accessibility.AccessBridge"/> + </implementation> +</component> diff --git a/accessibility/bridge/org/openoffice/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/accessibility/makefile.mk index 9510a3156..1fa29f5bf 100755 --- a/accessibility/bridge/org/openoffice/accessibility/makefile.mk +++ b/accessibility/bridge/org/openoffice/accessibility/makefile.mk @@ -53,3 +53,10 @@ CUSTOMMANIFESTFILE = manifest .INCLUDE : target.mk +ALLTAR : $(MISC)/java_uno_accessbridge.component + +$(MISC)/java_uno_accessbridge.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt java_uno_accessbridge.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt java_uno_accessbridge.component diff --git a/accessibility/prj/d.lst b/accessibility/prj/d.lst index f61319551..662373c7c 100644 --- a/accessibility/prj/d.lst +++ b/accessibility/prj/d.lst @@ -5,4 +5,4 @@ ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib - +..\%__SRC%\misc\java_uno_accessbridge.component %_DEST%\xml\java_uno_accessbridge.component diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 89e6287da..49dd197f9 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -1989,10 +1989,14 @@ void Document::handleParagraphNotifications() determineVisibleRange(); notifyVisibleRangeChanges(aOldVisibleBegin, aOldVisibleEnd, m_xParagraphs->end()); - Paragraphs::iterator aIt(m_xParagraphs->begin() + n); - ::rtl::Reference< ParagraphImpl > xParagraph(getParagraph(aIt)); - if (xParagraph.is()) - xParagraph->textChanged(); + + if (n < m_xParagraphs->size()) + { + Paragraphs::iterator aIt(m_xParagraphs->begin() + n); + ::rtl::Reference< ParagraphImpl > xParagraph(getParagraph(aIt)); + if (xParagraph.is()) + xParagraph->textChanged(); + } break; } default: diff --git a/accessibility/source/standard/vclxaccessiblelistboxlist.cxx b/accessibility/source/standard/vclxaccessiblelistboxlist.cxx deleted file mode 100644 index b88d19247..000000000 --- a/accessibility/source/standard/vclxaccessiblelistboxlist.cxx +++ /dev/null @@ -1,335 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_accessibility.hxx" -#include <accessibility/standard/vclxaccessiblelistboxlist.hxx> -#include <accessibility/standard/vclxaccessiblelistitem.hxx> -#include <accessibility/helper/listboxhelper.hxx> - -#include <algorithm> - -#include <com/sun/star/accessibility/AccessibleEventId.hpp> -#include <com/sun/star/accessibility/AccessibleStateType.hpp> -#include <tools/debug.hxx> -#include <vcl/svapp.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/unohelp.hxx> - -#include <toolkit/awt/vclxwindow.hxx> -#include <toolkit/helper/convert.hxx> - -#include <comphelper/sequence.hxx> -#include <cppuhelper/typeprovider.hxx> -#include <unotools/accessiblestatesethelper.hxx> - -using namespace ::com::sun::star; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::accessibility; - - -namespace -{ - void checkSelection_Impl( sal_Int32 _nIndex, const ListBox& _rListBox, sal_Bool bSelected ) - throw (::com::sun::star::lang::IndexOutOfBoundsException) - { - sal_Int32 nCount = bSelected ? (sal_Int32)_rListBox.GetSelectEntryCount() - : (sal_Int32)_rListBox.GetEntryCount(); - if ( _nIndex < 0 || _nIndex >= nCount ) - throw ::com::sun::star::lang::IndexOutOfBoundsException(); - } -} - - -VCLXAccessibleListBoxList::VCLXAccessibleListBoxList (VCLXWindow* pVCLWindow, - BoxType aBoxType,const Reference< XAccessible >& _xParent) - : VCLXAccessibleList (pVCLWindow, aBoxType, _xParent) -{ -} - - - - -VCLXAccessibleListBoxList::~VCLXAccessibleListBoxList (void) -{ -} - - - - -void VCLXAccessibleListBoxList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) -{ - switch ( rVclWindowEvent.GetId() ) - { - case VCLEVENT_LISTBOX_SCROLLED: - UpdateEntryRange_Impl(); - break; - - case VCLEVENT_LISTBOX_SELECT: - if ( !m_bDisableProcessEvent ) - UpdateSelection_Impl(); - break; - - default: - VCLXAccessibleList::ProcessWindowEvent (rVclWindowEvent); - } -} - -IMPLEMENT_FORWARD_XINTERFACE2(VCLXAccessibleListBoxList, VCLXAccessibleList, VCLXAccessibleListBoxList_BASE) -IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleListBoxList, VCLXAccessibleList, VCLXAccessibleListBoxList_BASE) - - - -//===== XServiceInfo ======================================================== - -::rtl::OUString VCLXAccessibleListBoxList::getImplementationName (void) - throw (RuntimeException) -{ - return ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleListBoxList"); -} - - - - -Sequence< ::rtl::OUString > VCLXAccessibleListBoxList::getSupportedServiceNames (void) - throw (RuntimeException) -{ - Sequence< ::rtl::OUString > aNames = VCLXAccessibleList::getSupportedServiceNames(); - sal_Int32 nLength = aNames.getLength(); - aNames.realloc( nLength + 1 ); - aNames[nLength] = ::rtl::OUString::createFromAscii( - "com.sun.star.accessibility.AccessibleListBoxList"); - return aNames; -} -// ----------------------------------------------------------------------------- - -void VCLXAccessibleListBoxList::UpdateSelection_Impl() -{ - uno::Any aOldValue, aNewValue; - - { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - Reference< XAccessible > xNewAcc; - - ListBox* pListBox = static_cast< ListBox* >( GetWindow() ); - if ( pListBox ) - { - USHORT nPos = 0; - ListItems::iterator aEnd = m_aAccessibleChildren.end(); - for ( ListItems::iterator aIter = m_aAccessibleChildren.begin(); - aIter != aEnd; ++aIter,++nPos) - { - if ( aIter->is() ) - { - VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >( aIter->get() ); - // Retrieve the item's index from the list entry. - BOOL bNowSelected = pListBox->IsEntryPosSelected (nPos); - - if ( bNowSelected && !pItem->IsSelected() ) - { - xNewAcc = *aIter; - aNewValue <<= xNewAcc; - m_nLastSelectedPos = nPos; - } - - pItem->SetSelected( bNowSelected ); - } - else - { // it could happen that a child was not created before - checkEntrySelected(pListBox,nPos,aNewValue,xNewAcc); - } - } - - USHORT nCount = pListBox->GetEntryCount(); - if ( nPos < nCount ) // here we have to check the if any other listbox entry is selected - { - for (; nPos < nCount && !checkEntrySelected(pListBox,nPos,aNewValue,xNewAcc) ;++nPos ) - ; - } - } - - if ( xNewAcc.is() && pListBox->HasFocus() ) - { - if ( m_nLastSelectedPos != LISTBOX_ENTRY_NOTFOUND ) - aOldValue <<= getAccessibleChild( (sal_Int32)m_nLastSelectedPos ); - aNewValue <<= xNewAcc; - } - } - - if ( aNewValue.hasValue() || aOldValue.hasValue() ) - NotifyAccessibleEvent( - AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, - aOldValue, - aNewValue ); - - NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() ); -} - -// ----------------------------------------------------------------------------- -// XAccessibleSelection -// ----------------------------------------------------------------------------- -void SAL_CALL VCLXAccessibleListBoxList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) -{ - sal_Bool bNotify = sal_False; - - { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - ListBox* pListBox = static_cast< ListBox* >( GetWindow() ); - if ( pListBox ) - { - checkSelection_Impl( nChildIndex, *pListBox, sal_False ); - pListBox->SelectEntryPos( (USHORT)nChildIndex, TRUE ); - // call the select handler, don't handle events in this time - m_bDisableProcessEvent = true; - pListBox->Select(); - m_bDisableProcessEvent = false; - bNotify = sal_True; - } - } - - if ( bNotify ) - UpdateSelection_Impl(); -} -// ----------------------------------------------------------------------------- -sal_Bool SAL_CALL VCLXAccessibleListBoxList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) -{ - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - sal_Bool bRet = sal_False; - ListBox* pListBox = static_cast< ListBox* >( GetWindow() ); - if ( pListBox ) - { - checkSelection_Impl( nChildIndex, *pListBox, sal_False ); - bRet = pListBox->IsEntryPosSelected( (USHORT)nChildIndex ); - } - return bRet; -} -// ----------------------------------------------------------------------------- -void SAL_CALL VCLXAccessibleListBoxList::clearAccessibleSelection( ) throw (RuntimeException) -{ - sal_Bool bNotify = sal_False; - - { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - ListBox* pListBox = static_cast< ListBox* >( GetWindow() ); - if ( pListBox ) - { - pListBox->SetNoSelection(); - bNotify = sal_True; - } - } - - if ( bNotify ) - UpdateSelection_Impl(); -} -// ----------------------------------------------------------------------------- -void SAL_CALL VCLXAccessibleListBoxList::selectAllAccessibleChildren( ) throw (RuntimeException) -{ - sal_Bool bNotify = sal_False; - - { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - ListBox* pListBox = static_cast< ListBox* >( GetWindow() ); - if ( pListBox ) - { - USHORT nCount = pListBox->GetEntryCount(); - for ( USHORT i = 0; i < nCount; ++i ) - pListBox->SelectEntryPos( i, TRUE ); - // call the select handler, don't handle events in this time - m_bDisableProcessEvent = true; - pListBox->Select(); - m_bDisableProcessEvent = false; - bNotify = sal_True; - } - } - - if ( bNotify ) - UpdateSelection_Impl(); -} -// ----------------------------------------------------------------------------- -sal_Int32 SAL_CALL VCLXAccessibleListBoxList::getSelectedAccessibleChildCount( ) throw (RuntimeException) -{ - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - sal_Int32 nCount = 0; - ListBox* pListBox = static_cast< ListBox* >( GetWindow() ); - if ( pListBox ) - nCount = pListBox->GetSelectEntryCount(); - return nCount; -} -// ----------------------------------------------------------------------------- -Reference< XAccessible > SAL_CALL VCLXAccessibleListBoxList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) -{ - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - ListBox* pListBox = static_cast< ListBox* >( GetWindow() ); - if ( pListBox ) - { - checkSelection_Impl( nSelectedChildIndex, *pListBox, sal_True ); - return getAccessibleChild( (sal_Int32)pListBox->GetSelectEntryPos( (USHORT)nSelectedChildIndex ) ); - } - - return NULL; -} -// ----------------------------------------------------------------------------- -void SAL_CALL VCLXAccessibleListBoxList::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) -{ - sal_Bool bNotify = sal_False; - - { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - ListBox* pListBox = static_cast< ListBox* >( GetWindow() ); - if ( pListBox ) - { - checkSelection_Impl( nSelectedChildIndex, *pListBox, sal_False ); - pListBox->SelectEntryPos( (USHORT)nSelectedChildIndex, FALSE ); - // call the select handler, don't handle events in this time - m_bDisableProcessEvent = true; - pListBox->Select(); - m_bDisableProcessEvent = false; - bNotify = sal_True; - } - } - - if ( bNotify ) - UpdateSelection_Impl(); -} -// ----------------------------------------------------------------------------- - diff --git a/automation/inc/automation/commtypes.hxx b/automation/inc/automation/commtypes.hxx index 00c0172fa..3cb1ac16c 100644 --- a/automation/inc/automation/commtypes.hxx +++ b/automation/inc/automation/commtypes.hxx @@ -31,7 +31,7 @@ * This file is intended to supply the types and defines for Environment independent * building of the packethandler * Only adaption of this file should be necessary. Else it is a bug! - * Eather including apropriate files or defining the types when not available in the environment + * Ether including apropriate files or defining the types when not available in the environment * ************************************************************************/ @@ -52,6 +52,7 @@ #include <sal/types.h> typedef sal_Unicode comm_UniChar; +#include "rtl/string.hxx" // this is a trick to be sure the SO types are unknown, so the compiler will yell at us in case we use them #ifndef _SOLAR_H @@ -93,7 +94,7 @@ typedef UINT32 comm_UINT32; typedef sal_uInt16 comm_WORD; typedef sal_uInt32 comm_DWORD; -class SmartId; +class rtl::OString; class String; #define comm_String String diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx index e726530b4..822613e45 100644 --- a/automation/inc/automation/communi.hxx +++ b/automation/inc/automation/communi.hxx @@ -76,10 +76,10 @@ public: CommunicationManagerClient( BOOL bUseMultiChannel = FALSE ); }; -class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public NAMESPACE_VOS(OThread) +class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public vos::OThread { public: - CommunicationLinkViaSocket( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket ); + CommunicationLinkViaSocket( CommunicationManager *pMan, vos::OStreamSocket *pSocket ); virtual ~CommunicationLinkViaSocket(); virtual BOOL IsCommunicationError(); @@ -101,8 +101,8 @@ protected: virtual BOOL ShutdownCommunication(); ULONG nConnectionClosedEventId; ULONG nDataReceivedEventId; - NAMESPACE_VOS(OMutex) aMConnectionClosed; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist - NAMESPACE_VOS(OMutex) aMDataReceived; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist + vos::OMutex aMConnectionClosed; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist + vos::OMutex aMDataReceived; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist virtual void WaitForShutdown(); DECL_LINK( ShutdownLink, void* ); @@ -133,7 +133,7 @@ private: void AddConnection( CommunicationLink *pNewConnection ); }; -class CommunicationManagerServerAcceptThread: public NAMESPACE_VOS(OThread) +class CommunicationManagerServerAcceptThread: public vos::OThread { public: CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, ULONG nPort, USHORT nMaxCon = CM_UNLIMITED_CONNECTIONS ); @@ -145,11 +145,11 @@ protected: private: CommunicationManagerServerViaSocket* pMyServer; - NAMESPACE_VOS(OAcceptorSocket) *pAcceptorSocket; + vos::OAcceptorSocket *pAcceptorSocket; ULONG nPortToListen; USHORT nMaxConnections; ULONG nAddConnectionEventId; - NAMESPACE_VOS(OMutex) aMAddConnection; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist + vos::OMutex aMAddConnection; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist void CallInfoMsg( InfoString aMsg ){ pMyServer->CallInfoMsg( aMsg ); } CM_InfoType GetInfoType(){ return pMyServer->GetInfoType(); } @@ -174,7 +174,7 @@ private: ByteString aHostToTalk; ULONG nPortToTalk; protected: - virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, NAMESPACE_VOS(OConnectorSocket) *pCS ){ return new CommunicationLinkViaSocket( pCM, pCS ); } + virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, vos::OConnectorSocket *pCS ){ return new CommunicationLinkViaSocket( pCM, pCS ); } }; #endif diff --git a/automation/inc/automation/simplecm.hxx b/automation/inc/automation/simplecm.hxx index ee0f42680..44bd6e688 100644 --- a/automation/inc/automation/simplecm.hxx +++ b/automation/inc/automation/simplecm.hxx @@ -337,14 +337,14 @@ private: ByteString aMyName; TCPIO* pTCPIO; - NAMESPACE_VOS(OStreamSocket) *pStreamSocket; + vos::OStreamSocket *pStreamSocket; protected: - SimpleCommunicationLinkViaSocket( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket ); + SimpleCommunicationLinkViaSocket( CommunicationManager *pMan, vos::OStreamSocket *pSocket ); virtual ~SimpleCommunicationLinkViaSocket(); - NAMESPACE_VOS(OStreamSocket)* GetStreamSocket() { return pStreamSocket; } - void SetStreamSocket( NAMESPACE_VOS(OStreamSocket)* pSocket ); + vos::OStreamSocket* GetStreamSocket() { return pStreamSocket; } + void SetStreamSocket( vos::OStreamSocket* pSocket ); SvStream *pReceiveStream; BOOL DoReceiveDataStream(); /// Recieve DataPacket from Socket @@ -358,7 +358,7 @@ protected: class SimpleCommunicationLinkViaSocketWithReceiveCallbacks : public SimpleCommunicationLinkViaSocket { public: - SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket ); + SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, vos::OStreamSocket *pSocket ); ~SimpleCommunicationLinkViaSocketWithReceiveCallbacks(); virtual BOOL ReceiveDataStream(); protected: @@ -371,7 +371,7 @@ class CommonSocketFunctions public: BOOL DoStartCommunication( CommunicationManager *pCM, ICommunicationManagerClient *pCMC, ByteString aHost, ULONG nPort ); protected: - virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, NAMESPACE_VOS(OConnectorSocket) *pCS )=0; + virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, vos::OConnectorSocket *pCS )=0; }; class SingleCommunicationManagerClientViaSocket : public SingleCommunicationManager, public ICommunicationManagerClient, CommonSocketFunctions @@ -387,7 +387,7 @@ private: ByteString aHostToTalk; ULONG nPortToTalk; protected: - virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, NAMESPACE_VOS(OConnectorSocket) *pCS ){ return new SimpleCommunicationLinkViaSocketWithReceiveCallbacks( pCM, pCS ); } + virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, vos::OConnectorSocket *pCS ){ return new SimpleCommunicationLinkViaSocketWithReceiveCallbacks( pCM, pCS ); } }; #endif diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx index 42402d7e9..0fe86ae26 100644 --- a/automation/source/communi/communi.cxx +++ b/automation/source/communi/communi.cxx @@ -66,9 +66,9 @@ _SV_SEEK_PTR( nm, AE ) SV_IMPL_PTRARR_SORT( CommunicationLinkList, CommunicationLink* ); -NAMESPACE_VOS(OMutex) *pMPostUserEvent=NULL; // Notwendig, da nicht threadfest +vos::OMutex *pMPostUserEvent=NULL; // Notwendig, da nicht threadfest -CommunicationLinkViaSocket::CommunicationLinkViaSocket( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket ) +CommunicationLinkViaSocket::CommunicationLinkViaSocket( CommunicationManager *pMan, vos::OStreamSocket *pSocket ) : SimpleCommunicationLinkViaSocket( pMan, pSocket ) , nConnectionClosedEventId( 0 ) , nDataReceivedEventId( 0 ) @@ -77,7 +77,7 @@ CommunicationLinkViaSocket::CommunicationLinkViaSocket( CommunicationManager *pM { SetPutDataReceivedHdl(LINK( this, CommunicationLinkViaSocket, PutDataReceivedHdl )); if ( !pMPostUserEvent ) - pMPostUserEvent = new NAMESPACE_VOS(OMutex); + pMPostUserEvent = new vos::OMutex; // this is necassary to prevent the running thread from sending the close event // before the open event has been sent. StartCallback(); @@ -92,7 +92,7 @@ CommunicationLinkViaSocket::~CommunicationLinkViaSocket() while ( nConnectionClosedEventId || nDataReceivedEventId ) GetpApp()->Yield(); { - NAMESPACE_VOS(OGuard) aGuard( aMConnectionClosed ); + vos::OGuard aGuard( aMConnectionClosed ); if ( nConnectionClosedEventId ) { GetpApp()->RemoveUserEvent( nConnectionClosedEventId ); @@ -103,7 +103,7 @@ CommunicationLinkViaSocket::~CommunicationLinkViaSocket() } } { - NAMESPACE_VOS(OGuard) aGuard( aMDataReceived ); + vos::OGuard aGuard( aMDataReceived ); if ( nDataReceivedEventId ) { GetpApp()->RemoveUserEvent( nDataReceivedEventId ); @@ -132,7 +132,7 @@ BOOL CommunicationLinkViaSocket::ShutdownCommunication() join(); - NAMESPACE_VOS(OStreamSocket) *pTempSocket = GetStreamSocket(); + vos::OStreamSocket *pTempSocket = GetStreamSocket(); SetStreamSocket( NULL ); delete pTempSocket; @@ -209,8 +209,8 @@ void CommunicationLinkViaSocket::run() SetNewPacketAsCurrent(); StartCallback(); { - NAMESPACE_VOS(OGuard) aGuard( aMDataReceived ); - NAMESPACE_VOS(OGuard) aGuard2( *pMPostUserEvent ); + vos::OGuard aGuard( aMDataReceived ); + vos::OGuard aGuard2( *pMPostUserEvent ); mlPutDataReceived.Call(this); } } @@ -220,8 +220,8 @@ void CommunicationLinkViaSocket::run() StartCallback(); { - NAMESPACE_VOS(OGuard) aGuard( aMConnectionClosed ); - NAMESPACE_VOS(OGuard) aGuard2( *pMPostUserEvent ); + vos::OGuard aGuard( aMConnectionClosed ); + vos::OGuard aGuard2( *pMPostUserEvent ); nConnectionClosedEventId = GetpApp()->PostUserEvent( LINK( this, CommunicationLinkViaSocket, ConnectionClosed ) ); } } @@ -238,7 +238,7 @@ BOOL CommunicationLinkViaSocket::DoTransferDataStream( SvStream *pDataStream, CM long CommunicationLinkViaSocket::ConnectionClosed( void* EMPTYARG ) { { - NAMESPACE_VOS(OGuard) aGuard( aMConnectionClosed ); + vos::OGuard aGuard( aMConnectionClosed ); nConnectionClosedEventId = 0; // Achtung!! alles andere muß oben gemacht werden. } ShutdownCommunication(); @@ -249,7 +249,7 @@ long CommunicationLinkViaSocket::ConnectionClosed( void* EMPTYARG ) long CommunicationLinkViaSocket::DataReceived( void* EMPTYARG ) { { - NAMESPACE_VOS(OGuard) aGuard( aMDataReceived ); + vos::OGuard aGuard( aMDataReceived ); nDataReceivedEventId = 0; // Achtung!! alles andere muß oben gemacht werden. } return CommunicationLink::DataReceived( ); @@ -453,7 +453,7 @@ CommunicationManagerServerAcceptThread::CommunicationManagerServerAcceptThread( , xmNewConnection( NULL ) { if ( !pMPostUserEvent ) - pMPostUserEvent = new NAMESPACE_VOS(OMutex); + pMPostUserEvent = new vos::OMutex; create(); } @@ -480,7 +480,7 @@ CommunicationManagerServerAcceptThread::~CommunicationManagerServerAcceptThread( DEBUGPRINTF ("Destructor CommunicationManagerServerAcceptThread Übersprungen!!!! (wegen Solaris BUG)\n"); #endif { - NAMESPACE_VOS(OGuard) aGuard( aMAddConnection ); + vos::OGuard aGuard( aMAddConnection ); if ( nAddConnectionEventId ) { GetpApp()->RemoveUserEvent( nAddConnectionEventId ); @@ -500,8 +500,8 @@ void CommunicationManagerServerAcceptThread::run() if ( !nPortToListen ) return; - pAcceptorSocket = new NAMESPACE_VOS(OAcceptorSocket)(); - NAMESPACE_VOS(OInetSocketAddr) Addr; + pAcceptorSocket = new vos::OAcceptorSocket(); + vos::OInetSocketAddr Addr; Addr.setPort( nPortToListen ); pAcceptorSocket->setReuseAddr( 1 ); if ( !pAcceptorSocket->bind( Addr ) ) @@ -514,14 +514,14 @@ void CommunicationManagerServerAcceptThread::run() } - NAMESPACE_VOS(OStreamSocket) *pStreamSocket = NULL; + vos::OStreamSocket *pStreamSocket = NULL; while ( schedule() ) { - pStreamSocket = new NAMESPACE_VOS(OStreamSocket); + pStreamSocket = new vos::OStreamSocket; switch ( pAcceptorSocket->acceptConnection( *pStreamSocket ) ) { - case NAMESPACE_VOS(ISocketTypes::TResult_Ok): + case vos::ISocketTypes::TResult_Ok: { pStreamSocket->setTcpNoDelay( 1 ); @@ -531,23 +531,23 @@ void CommunicationManagerServerAcceptThread::run() xmNewConnection = new CommunicationLinkViaSocket( pMyServer, pStreamSocket ); xmNewConnection->StartCallback(); { - NAMESPACE_VOS(OGuard) aGuard( aMAddConnection ); - NAMESPACE_VOS(OGuard) aGuard2( *pMPostUserEvent ); + vos::OGuard aGuard( aMAddConnection ); + vos::OGuard aGuard2( *pMPostUserEvent ); nAddConnectionEventId = GetpApp()->PostUserEvent( LINK( this, CommunicationManagerServerAcceptThread, AddConnection ) ); } } break; - case NAMESPACE_VOS(ISocketTypes::TResult_TimedOut): + case vos::ISocketTypes::TResult_TimedOut: delete pStreamSocket; pStreamSocket = NULL; break; - case NAMESPACE_VOS(ISocketTypes::TResult_Error): + case vos::ISocketTypes::TResult_Error: delete pStreamSocket; pStreamSocket = NULL; break; - case NAMESPACE_VOS(ISocketTypes::TResult_Interrupted): - case NAMESPACE_VOS(ISocketTypes::TResult_InProgress): + case vos::ISocketTypes::TResult_Interrupted: + case vos::ISocketTypes::TResult_InProgress: break; // -Wall not handled... } } @@ -557,7 +557,7 @@ void CommunicationManagerServerAcceptThread::run() IMPL_LINK( CommunicationManagerServerAcceptThread, AddConnection, void*, EMPTYARG ) { { - NAMESPACE_VOS(OGuard) aGuard( aMAddConnection ); + vos::OGuard aGuard( aMAddConnection ); nAddConnectionEventId = 0; } pMyServer->AddConnection( xmNewConnection ); diff --git a/automation/source/inc/cmdbasestream.hxx b/automation/source/inc/cmdbasestream.hxx index 22ffe4e26..c598cafa1 100644 --- a/automation/source/inc/cmdbasestream.hxx +++ b/automation/source/inc/cmdbasestream.hxx @@ -48,20 +48,25 @@ protected: public: - void GenError( SmartId *pUId, comm_String *pString ); + void GenError( rtl::OString *pUId, comm_String *pString ); void GenReturn( comm_USHORT nRet, comm_ULONG nNr ); - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr ); - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_String *pString ); - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_BOOL bBool ); - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_String *pString ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_BOOL bBool ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool ); + + void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr ); + void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_String *pString ); + void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL bBool ); + void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_USHORT nNr ); // MacroRecorder - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod ); - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString ); - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool ); - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_BOOL bBool ); - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_ULONG nNr ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod ); // also used outside MacroRecorder + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_BOOL bBool ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_ULONG nNr ); void Read ( comm_USHORT &nNr ); void Read ( comm_ULONG &nNr ); @@ -76,10 +81,10 @@ public: // Complex Datatypes to be handled system dependent virtual void Read ( comm_String *&pString ); - virtual void Read ( SmartId* &pId ); + virtual void Read ( rtl::OString* &pId ); virtual void Write( comm_String *pString ); - virtual void Write( SmartId* pId ); + virtual void Write( rtl::OString* pId ); }; #endif diff --git a/automation/source/inc/rcontrol.hxx b/automation/source/inc/rcontrol.hxx index 32b5fdd3c..2f02c66d9 100644 --- a/automation/source/inc/rcontrol.hxx +++ b/automation/source/inc/rcontrol.hxx @@ -37,13 +37,13 @@ #define _RCONTROL_HXX -#define UID_ACTIVE 0 +#define UID_ACTIVE "UID_ACTIVE" #define SI_IPCCommandBlock 1 #define SI_SocketCommandBlock SI_IPCCommandBlock // Zumindest erstmal #define SI_DirectCommandBlock 2 -#define SIControl 3 +#define SIControl 3 // remove after numeric HelpIDs are completely removed and no legacy testtool is used anymore #define SISlot 4 #define SIFlow 5 #define SICommand 6 diff --git a/automation/source/inc/testapp.hxx b/automation/source/inc/testapp.hxx index 7d6eb4070..a70ccadf0 100644 --- a/automation/source/inc/testapp.hxx +++ b/automation/source/inc/testapp.hxx @@ -30,7 +30,6 @@ #include <basic/sbmod.hxx> #include <basic/testtool.hxx> -#include <vcl/smartid.hxx> class CommunicationLink; class CommunicationManagerClientViaSocketTT; @@ -129,7 +128,7 @@ private: BOOL bReturnOK; // Bricht WaitForAnswer ab CRevNames *pShortNames; // Aktuell verwendete Controls, zur gewinnung des Namens aus Fehlermeldung ULONG nSequence; // Sequence um Antwort und Anfrage zu syncronisieren - SmartId aNextReturnId; // Id des Returnwertes i.e. UId + rtl::OString aNextReturnId; // Id des Returnwertes i.e. UId void ReplaceNumbers(String &aText); // Zahlen im String mit speziellem Format in Namen umwandeln String aLastRecordedKontext;// Keeps the last kontext recorded by the Macro Recorder diff --git a/automation/source/miniapp/servres.hrc b/automation/source/miniapp/servres.hrc index 506b2ecb3..508258df4 100644 --- a/automation/source/miniapp/servres.hrc +++ b/automation/source/miniapp/servres.hrc @@ -29,9 +29,9 @@ #define IDM_FILE 1 #define IDM_FILE_OPEN_TEST 2 #define IDM_FILE_EXIT 3 -#define IDM_FILE_EXIT_HELP 4 -#define IDM_FILE_OPEN_TEST_HELP 1 -#define IDM_FILE_HELP 3 +#define IDM_FILE_EXIT_HELP "AUTOMATION_IDM_FILE_EXIT_HELP" +#define IDM_FILE_OPEN_TEST_HELP "AUTOMATION_IDM_FILE_OPEN_TEST_HELP" +#define IDM_FILE_HELP "AUTOMATION_IDM_FILE_HELP" #define GROSSER_TEST_DLG 256 #define IDM_TEST 5 #define IDM_TEST_GROSS 6 diff --git a/automation/source/miniapp/servres.src b/automation/source/miniapp/servres.src index a0516a94a..f6f7b7e65 100644 --- a/automation/source/miniapp/servres.src +++ b/automation/source/miniapp/servres.src @@ -54,7 +54,7 @@ ModalDialog GROSSER_TEST_DLG }; OKButton 1 { - HelpID = 1 ; + HelpID = "hid1" ; Pos = MAP_APPFONT ( 132 , 92 ) ; Size = MAP_APPFONT ( 64 , 12 ) ; TabStop = TRUE ; diff --git a/automation/source/miniapp/servuid.hxx b/automation/source/miniapp/servuid.hxx index 87bba9fa9..26ec5174a 100644 --- a/automation/source/miniapp/servuid.hxx +++ b/automation/source/miniapp/servuid.hxx @@ -24,14 +24,14 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define UID_GROSSER_TEST_DLG 101 -#define UID_CheckBox 202 -#define UID_TriStateBox 303 -#define UID_OKButton 404 -#define UID_TimeField 505 -#define UID_MultiLineEdit 606 -#define UID_RadioButton1 707 -#define UID_RadioButton2 708 -#define UID_MultiListBox 809 -#define UID_ComboBox 910 -#define UID_DateBox 1011 +#define UID_GROSSER_TEST_DLG "AUTOMATION_UID_GROSSER_TEST_DLG" +#define UID_CheckBox "AUTOMATION_UID_CheckBox" +#define UID_TriStateBox "AUTOMATION_UID_TriStateBox" +#define UID_OKButton "AUTOMATION_UID_OKButton" +#define UID_TimeField "AUTOMATION_UID_TimeField" +#define UID_MultiLineEdit "AUTOMATION_UID_MultiLineEdit" +#define UID_RadioButton1 "AUTOMATION_UID_RadioButton1" +#define UID_RadioButton2 "AUTOMATION_UID_RadioButton2" +#define UID_MultiListBox "AUTOMATION_UID_MultiListBox" +#define UID_ComboBox "AUTOMATION_UID_ComboBox" +#define UID_DateBox "AUTOMATION_UID_DateBox" diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx index f0e0a86aa..f7d1eb1a4 100644 --- a/automation/source/miniapp/testapp.cxx +++ b/automation/source/miniapp/testapp.cxx @@ -122,7 +122,8 @@ void MainWindow::Tree(GHEditWindow *aEditWin, Window *pBase, USHORT Indent) aText.SearchAndReplaceAllAscii("\n",CUniString("\\n")); aEditWin->AddText(String(sIndent).AppendAscii("Text: ").Append(aText).AppendAscii("\n")); - aEditWin->AddText(String(sIndent).AppendAscii("Help: ").Append(String::CreateFromInt64(pBase->GetHelpId())).AppendAscii(":").Append(pBase->GetQuickHelpText()).AppendAscii(":").Append(pBase->GetHelpText()).AppendAscii("\n")); + // FIXME: HELPID + aEditWin->AddText(String(sIndent).AppendAscii("Help: ").Append(String(rtl::OStringToOUString(pBase->GetHelpId(), RTL_TEXTENCODING_UTF8))).AppendAscii(":").Append(pBase->GetQuickHelpText()).AppendAscii(":").Append(pBase->GetHelpText()).AppendAscii("\n")); USHORT i; for (i = 0 ; i < pBase->GetChildCount() ; i++) diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx index 38408558f..1d977e6ae 100644 --- a/automation/source/server/XMLParser.cxx +++ b/automation/source/server/XMLParser.cxx @@ -458,7 +458,7 @@ void StatementCommand::HandleSAXParser() { if ( !pSAXParser->Parse( PARSE_ONLY ) ) ReportError( GEN_RES_STR1( S_NO_SAX_PARSER, RcString( nMethodId ) ) ); - pRet->GenReturn ( RET_Value, aSmartMethodId, pSAXParser->GetErrors() ); + pRet->GenReturn ( RET_Value, nMethodId, pSAXParser->GetErrors() ); } xParserKeepaliveReference.clear(); @@ -488,7 +488,7 @@ void StatementCommand::HandleSAXParser() if ( !pSAXParser->Parse( aAction ) ) ReportError( GEN_RES_STR1( S_NO_SAX_PARSER, RcString( nMethodId ) ) ); - pRet->GenReturn ( RET_Value, aSmartMethodId, pSAXParser->GetErrors() ); + pRet->GenReturn ( RET_Value, nMethodId, pSAXParser->GetErrors() ); } } else @@ -497,7 +497,7 @@ void StatementCommand::HandleSAXParser() break; case RC_SAXGetNodeType: { - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)pSAXParser->GetCurrentNode()->GetNodeType() ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pSAXParser->GetCurrentNode()->GetNodeType() ); } break; case RC_SAXGetAttributeCount: @@ -512,23 +512,23 @@ void StatementCommand::HandleSAXParser() switch ( nMethodId ) { case RC_SAXGetElementName: - pRet->GenReturn ( RET_Value, aSmartMethodId, pElementNode->GetNodeName() ); + pRet->GenReturn ( RET_Value, nMethodId, pElementNode->GetNodeName() ); break; case RC_SAXGetChildCount: - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)pElementNode->GetChildCount() ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pElementNode->GetChildCount() ); break; case RC_SAXGetAttributeCount: if ( xAttributeList.is() ) - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)xAttributeList->getLength() ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)xAttributeList->getLength() ); else - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)0 ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)0 ); break; case RC_SAXGetAttributeName: { - if( (nParams & PARAM_USHORT_1) && ValueOK( aSmartMethodId, RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) ) + if( (nParams & PARAM_USHORT_1) && ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) ) { String aRet( xAttributeList->getNameByIndex( nNr1-1 ) ); - pRet->GenReturn ( RET_Value, aSmartMethodId, aRet ); + pRet->GenReturn ( RET_Value, nMethodId, aRet ); } else ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) ); @@ -537,15 +537,15 @@ void StatementCommand::HandleSAXParser() case RC_SAXGetAttributeValue: // Number or String { - if( (nParams & PARAM_USHORT_1) && ValueOK( aSmartMethodId, RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) ) + if( (nParams & PARAM_USHORT_1) && ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) ) { String aRet( xAttributeList->getValueByIndex( nNr1-1 ) ); - pRet->GenReturn ( RET_Value, aSmartMethodId, aRet ); + pRet->GenReturn ( RET_Value, nMethodId, aRet ); } else if( (nParams & PARAM_STR_1) && xAttributeList.is() ) { String aRet( xAttributeList->getValueByName( aString1 ) ); - pRet->GenReturn ( RET_Value, aSmartMethodId, aRet ); + pRet->GenReturn ( RET_Value, nMethodId, aRet ); } else ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) ); @@ -566,7 +566,7 @@ void StatementCommand::HandleSAXParser() { NodeRef xNode=pSAXParser->GetCurrentNode(); CharacterNode* aCharacterNode = (CharacterNode*)(&xNode); - pRet->GenReturn ( RET_Value, aSmartMethodId, aCharacterNode->GetCharacters() ); + pRet->GenReturn ( RET_Value, nMethodId, aCharacterNode->GetCharacters() ); } else ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) ); @@ -584,15 +584,15 @@ void StatementCommand::HandleSAXParser() if ( nNr1 == 0 ) { if ( bCheckOnly ) - pRet->GenReturn ( RET_Value, aSmartMethodId, pSAXParser->GetCurrentNode()->GetParent().Is() ); + pRet->GenReturn ( RET_Value, nMethodId, pSAXParser->GetCurrentNode()->GetParent().Is() ); else if ( pSAXParser->GetCurrentNode()->GetParent().Is() ) pSAXParser->SetCurrentNode( pSAXParser->GetCurrentNode()->GetParent() ); } else if ( !pElementNode ) ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) ); else if ( bCheckOnly ) - pRet->GenReturn ( RET_Value, aSmartMethodId, ValueOK( aSmartMethodId, String(), nNr1, pElementNode->GetChildCount() ) ); - else if ( ValueOK( aSmartMethodId, RcString( nMethodId ), nNr1, pElementNode->GetChildCount() ) ) + pRet->GenReturn ( RET_Value, nMethodId, ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, pElementNode->GetChildCount() ) ); + else if ( ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, pElementNode->GetChildCount() ) ) pSAXParser->SetCurrentNode( pElementNode->GetChild( nNr1-1 ) ); } else if( (nParams & PARAM_STR_1) ) @@ -600,7 +600,7 @@ void StatementCommand::HandleSAXParser() if ( aString1.EqualsAscii( "/" ) ) { if ( bCheckOnly ) - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)TRUE ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)TRUE ); else pSAXParser->SetCurrentNode( pSAXParser->GetRootNode() ); } @@ -609,7 +609,7 @@ void StatementCommand::HandleSAXParser() ULONG nTimestamp = (ULONG)aString1.GetToken( 1, ':' ).ToInt64(); ULONG nPointer = (ULONG)aString1.GetToken( 2, ':' ).ToInt64(); if ( bCheckOnly ) - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)(pSAXParser->GetTimestamp() == nTimestamp) ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)(pSAXParser->GetTimestamp() == nTimestamp) ); else if ( pSAXParser->GetTimestamp() == nTimestamp ) { @@ -652,7 +652,7 @@ void StatementCommand::HandleSAXParser() xNew.Clear(); } if ( bCheckOnly ) - pRet->GenReturn ( RET_Value, aSmartMethodId, xNew.Is() ); + pRet->GenReturn ( RET_Value, nMethodId, xNew.Is() ); else if ( xNew.Is() ) pSAXParser->SetCurrentNode( xNew ); @@ -661,7 +661,7 @@ void StatementCommand::HandleSAXParser() } else if ( bCheckOnly ) - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)FALSE ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)FALSE ); else ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) ); } @@ -679,7 +679,7 @@ void StatementCommand::HandleSAXParser() NodeRef xNode=pSAXParser->GetCurrentNode(); Node* pNode = (Node*)(&xNode); aPath.Append( String::CreateFromInt64( (ULONG)pNode ) ); - pRet->GenReturn ( RET_Value, aSmartMethodId, aPath ); + pRet->GenReturn ( RET_Value, nMethodId, aPath ); } break; diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx index 20cf93c7d..9217c7abc 100644 --- a/automation/source/server/cmdbasestream.cxx +++ b/automation/source/server/cmdbasestream.cxx @@ -49,7 +49,7 @@ CmdBaseStream::~CmdBaseStream() { } -void CmdBaseStream::GenError (SmartId *pUId, comm_String *pString ) +void CmdBaseStream::GenError (rtl::OString *pUId, comm_String *pString ) { Write(comm_USHORT(SIReturnError)); Write(pUId); @@ -64,46 +64,95 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_ULONG nUId ) Write(comm_USHORT(PARAM_NONE)); // Typ der folgenden Parameter } -void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr ) +void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr ) { Write(comm_USHORT(SIReturn)); Write(nRet); - Write(pUId); + if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) ) + Write(comm_ULONG(0)); + else + Write(pUId); Write(comm_USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter Write(nNr); } -void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_String *pString ) +void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_String *pString ) { Write(comm_USHORT(SIReturn)); Write(nRet); - Write(pUId); + if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) ) + Write(comm_ULONG(0)); + else + Write(pUId); Write(comm_USHORT(PARAM_STR_1)); // Typ der folgenden Parameter Write(pString); } -void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_BOOL bBool ) +void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_BOOL bBool ) { Write(comm_USHORT(SIReturn)); Write(nRet); - Write(pUId); + if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) ) + Write(comm_ULONG(0)); + else + Write(pUId); Write(comm_USHORT(PARAM_BOOL_1)); // Typ der folgenden Parameter Write(bBool); } -void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool ) +void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool ) { Write(comm_USHORT(SIReturn)); Write(nRet); - Write(pUId); + if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) ) + Write(comm_ULONG(0)); + else + Write(pUId); Write(comm_USHORT(PARAM_ULONG_1|PARAM_STR_1|PARAM_BOOL_1)); // Typ der folgenden Parameter Write(nNr); Write(pString); Write(bBool); } +void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr ) +{ + Write(comm_USHORT(SIReturn)); + Write(nRet); + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) + Write(comm_USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter + Write(nNr); +} + +void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_String *pString ) +{ + Write(comm_USHORT(SIReturn)); + Write(nRet); + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) + Write(comm_USHORT(PARAM_STR_1)); // Typ der folgenden Parameter + Write(pString); +} + +void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL bBool ) +{ + Write(comm_USHORT(SIReturn)); + Write(nRet); + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) + Write(comm_USHORT(PARAM_BOOL_1)); // Typ der folgenden Parameter + Write(bBool); +} + +void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_USHORT nNr ) +{ + Write(comm_USHORT(SIReturn)); + Write(nRet); + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) + Write(comm_USHORT(PARAM_USHORT_1)); // Typ der folgenden Parameter + Write(nNr); +} + + // MacroRecorder -void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod ) +void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -112,7 +161,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet Write(nMethod); } -void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString ) +void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -122,7 +171,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet Write(pString); } -void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool ) +void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -133,7 +182,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet Write(bBool); } -void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_BOOL bBool ) +void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_BOOL bBool ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -143,7 +192,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet Write(bBool); } -void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_ULONG nNr ) +void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_ULONG nNr ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -282,10 +331,10 @@ void CmdBaseStream::Read ( comm_String* &pString ) (void) pString; /* avoid warning about unused parameter */ DBG_ERROR("Read ( comm_String* &pString ) Not Implemented"); } -void CmdBaseStream::Read ( SmartId* &pId ) +void CmdBaseStream::Read ( rtl::OString* &pId ) { (void) pId; /* avoid warning about unused parameter */ - DBG_ERROR("Read ( SmartId* &pId ) Not Implemented"); + DBG_ERROR("Read ( rtl::OString* &pId ) Not Implemented"); } void CmdBaseStream::Write( comm_String *pString ) @@ -293,9 +342,9 @@ void CmdBaseStream::Write( comm_String *pString ) (void) pString; /* avoid warning about unused parameter */ DBG_ERROR("Write( comm_String *pString ) Not Implemented"); } -void CmdBaseStream::Write( SmartId* pId ) +void CmdBaseStream::Write( rtl::OString* pId ) { (void) pId; /* avoid warning about unused parameter */ - DBG_ERROR("Write( SmartId* pId ) Not Implemented"); + DBG_ERROR("Write( rtl::OString* pId ) Not Implemented"); } diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx index 380222ad8..8ee70a2d9 100644 --- a/automation/source/server/recorder.cxx +++ b/automation/source/server/recorder.cxx @@ -105,30 +105,30 @@ IMPL_LINK( MacroRecorder, HookRefreshHdl, void*, EMPTYARG ) return 0; } -void MacroRecorder::LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod, USHORT nParam ) +void MacroRecorder::LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod, USHORT nParam ) { - ::comphelper::UiEventsLogger::logVcl( aParentID.GetText(), nVCLWindowType, aID.GetText(), aMethod, nParam ); + ::comphelper::UiEventsLogger::logVcl( Id2Str( aParentID ), nVCLWindowType, Id2Str( aID ), aMethod, nParam ); } -void MacroRecorder::LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod ) +void MacroRecorder::LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod ) { - ::comphelper::UiEventsLogger::logVcl( aParentID.GetText(), nVCLWindowType, aID.GetText(), aMethod ); + ::comphelper::UiEventsLogger::logVcl( Id2Str( aParentID ), nVCLWindowType, Id2Str( aID ), aMethod ); } Window* MacroRecorder::GetParentWithID( Window* pThis ) { Window *pOverlap = pThis->GetWindow( WINDOW_OVERLAP ); - while ( pOverlap != pThis && !pThis->GetSmartUniqueOrHelpId().HasAny() && pThis->GET_REAL_PARENT() ) + while ( pOverlap != pThis && !pThis->GetUniqueOrHelpId().getLength() && pThis->GET_REAL_PARENT() ) pThis = pThis->GET_REAL_PARENT(); return pThis; } -SmartId MacroRecorder::GetParentID( Window* pThis ) +rtl::OString MacroRecorder::GetParentID( Window* pThis ) { if ( pThis->GetParent() ) - return pThis->GetParent()->GetSmartUniqueOrHelpId(); + return pThis->GetParent()->GetUniqueOrHelpId(); else - return SmartId(); + return rtl::OString(); } IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) @@ -177,7 +177,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bLog ) { -// HACK Too many KeyEvents generated LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeys"), aKeyString.Len() ); +// HACK Too many KeyEvents generated LogVCL( rtl::OString(), 0, aKeyUniqueID, CUniString("TypeKeys"), aKeyString.Len() ); } // cleanup aKeyString.Erase(); @@ -193,12 +193,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_WINDOW_ACTIVATE: if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId(), (comm_USHORT)(M_SetPage|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pWin->GetSmartUniqueOrHelpId().GetNum()) ); //GetNum() ULONG != comm_ULONG on 64bit + StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString(), (comm_USHORT)(M_SetPage|M_RET_NUM_CONTROL), Id2Str( pWin->GetUniqueOrHelpId() ) ); bSendData = TRUE; } if ( m_bLog ) { - LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("SetPage") ); + LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("SetPage") ); } break; } @@ -213,12 +213,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) { if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Check ); + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Check ); bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Check") ); + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Check") ); } } } @@ -243,12 +243,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod ); + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), nMethod ); bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod ); + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); } } break; @@ -277,12 +277,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_LISTBOX_SELECT: if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Select, comm_ULONG( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) ); + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, comm_ULONG( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) ); bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Select"), ((ListBox*)pWin)->GetSelectEntryPos() ); + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Select"), ((ListBox*)pWin)->GetSelectEntryPos() ); } break; } @@ -312,13 +312,13 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) Sound::Beep(); else { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Select, (comm_ULONG) nPos+1 ); + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, (comm_ULONG) nPos+1 ); bSendData = TRUE; } } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Select"), nPos ); + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Select"), nPos ); } } } @@ -334,7 +334,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_BUTTON_CLICK: Window* pParent = pWin->GetParent(); BOOL bDone = FALSE; - if ( pParent->IsDialog() && !pWin->GetSmartUniqueOrHelpId().HasAny() ) + if ( pParent->IsDialog() && !pWin->GetUniqueOrHelpId().getLength() ) { switch ( pParent->GetType() ) { @@ -374,17 +374,17 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) if ( m_bRecord ) { if ( nMethod != M_Click ) - StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( 0 ), nMethod ); + StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod ); else - StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( 0 ), nMethod, (comm_ULONG)nCurrentButtonId ); + StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod, (comm_ULONG)nCurrentButtonId ); bSendData = TRUE; } if ( m_bLog ) { if ( nMethod != M_Click ) - LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod ); + LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); else - LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod, nCurrentButtonId ); + LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod, nCurrentButtonId ); bDone = TRUE; } } @@ -403,12 +403,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, pParent->GetSmartUniqueOrHelpId(), nMethod ); + StatementList::pRet->GenReturn( RET_MacroRecorder, pParent->GetUniqueOrHelpId(), nMethod ); bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod ); + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); bDone = TRUE; } } @@ -417,16 +417,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - if ( !bSendData && pWin->GetSmartUniqueOrHelpId().HasAny() ) + if ( !bSendData && pWin->GetUniqueOrHelpId().getLength() ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Click ); + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click ); bSendData = TRUE; } } if ( m_bLog ) { if ( !bDone ) - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Click") ); + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Click") ); } } break; @@ -480,12 +480,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod ); + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), nMethod ); bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod ); + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); } } break; @@ -502,12 +502,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_BUTTON_CLICK: if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Click ); + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click ); bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Click") ); + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Click") ); } break; /* Keyevent or Timeout @@ -540,12 +540,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) // compare to 1 for floating ToolBoxes if ( m_bRecord ) { - if ( !pWin->GetSmartUniqueOrHelpId().HasAny() || pWin->GetSmartUniqueOrHelpId().Matches( 1 ) ) + if ( !pWin->GetUniqueOrHelpId().getLength() /* || pWin->GetUniqueOrHelpId().Matches( 1 ) */ ) // generate direct Button access - StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( pTB->GetItemCommand( pTB->GetCurItemId() ) ), (comm_USHORT)(M_Click) ); + StatementList::pRet->GenReturn( RET_MacroRecorder, Str2Id( pTB->GetItemCommand( pTB->GetCurItemId() ) ), (comm_USHORT)(M_Click) ); else // access via Toolbox - StatementList::pRet->GenReturn( RET_MacroRecorder, pTB->GetSmartUniqueOrHelpId(), (comm_USHORT)(M_Click|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pTB->GetHelpId( pTB->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit + StatementList::pRet->GenReturn( RET_MacroRecorder, pTB->GetUniqueOrHelpId(), (comm_USHORT)(M_Click|M_RET_NUM_CONTROL), Id2Str( pTB->GetHelpId( pTB->GetCurItemId() ) ) ); bSendData = TRUE; } /* not needed if ( m_bLog ) @@ -566,7 +566,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) // { // if ( !pWin->GetSmartUniqueOrHelpId().HasAny() || pWin->GetSmartUniqueOrHelpId().Matches( 1 ) ) // // generate direct Button access -// StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), (comm_USHORT)(M_TearOff) ); +// StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), (comm_USHORT)(M_TearOff) ); // else // // access via Toolbox // StatementList::pRet->GenReturn( RET_MacroRecorder, pActionParent->GetSmartUniqueOrHelpId(), (comm_USHORT)(M_TearOff|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pActionParent->GetHelpId( pActionParent->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit @@ -574,7 +574,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) // } // if ( m_bLog ) // { -// LogVCL( pActionParent->GetSmartUniqueOrHelpId(), pWin->GetType(), SmartId( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), CUniString("TearOff") ); +// LogVCL( pActionParent->GetSmartUniqueOrHelpId(), pWin->GetType(), pActionParent->GetHelpId( pActionParent->GetCurItemId() ), CUniString("TearOff") ); // } // } // pActionParent = NULL; @@ -676,11 +676,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) Window *pIdWin = GetParentWithID( pWin ); if ( pIdWin != pWin ) bKeyFollowFocus = TRUE; - aKeyUniqueID = pIdWin->GetSmartUniqueOrHelpId(); + aKeyUniqueID = pIdWin->GetUniqueOrHelpId(); if ( m_bLog ) { // HACK Too many KeyEvents generated if ( aKeyString.Len() == 0 ) -// HACK Too many KeyEvents generated LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeysStart") ); +// HACK Too many KeyEvents generated LogVCL( rtl::OString(), 0, aKeyUniqueID, CUniString("TypeKeysStart") ); } if ( ( !aKeyCode.IsMod1() && !aKeyCode.IsMod2() ) && (( aKeyCode.GetGroup() == KEYGROUP_NUM) || @@ -1024,12 +1024,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) { if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), M_SetText, aEditModifyString ); + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), M_SetText, aEditModifyString ); bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Modify") ); + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Modify") ); } pEditModify = NULL; aEditModifyString.Erase(); //could be somewhat lengthy diff --git a/automation/source/server/recorder.hxx b/automation/source/server/recorder.hxx index 845d21a3c..3d7117728 100644 --- a/automation/source/server/recorder.hxx +++ b/automation/source/server/recorder.hxx @@ -27,7 +27,6 @@ #include <tools/string.hxx> #include <tools/link.hxx> -#include <vcl/smartid.hxx> #include <vcl/timer.hxx> class ToolBox; @@ -38,7 +37,7 @@ class MacroRecorder { private: Window* GetParentWithID( Window* pThis ); - SmartId GetParentID( Window* pThis ); + rtl::OString GetParentID( Window* pThis ); Link aEventListenerHdl; DECL_LINK( EventListener, VclSimpleEvent* ); @@ -51,7 +50,7 @@ private: // record keys String aKeyString; - SmartId aKeyUniqueID; // has to be remembered seperately since Window might be gone when needed + rtl::OString aKeyUniqueID; // has to be remembered seperately since Window might be gone when needed Window* pKeyWin; BOOL bKeyFollowFocus; @@ -60,8 +59,8 @@ private: void RemoveEventHooks(); DECL_LINK( HookRefreshHdl, void* ); - void LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod, USHORT aParam ); - void LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod ); + void LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod, USHORT aParam ); + void LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod ); static MacroRecorder *pMacroRecorder; diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx index 2a462a63a..053203516 100644 --- a/automation/source/server/retstrm.cxx +++ b/automation/source/server/retstrm.cxx @@ -28,6 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_automation.hxx" #include <tools/stream.hxx> +#include <basic/ttstrhlp.hxx> #include "retstrm.hxx" #include "rcontrol.hxx" @@ -47,41 +48,50 @@ RetStream::~RetStream() delete pSammel; } -void RetStream::GenError ( SmartId aUId, String aString ) +void RetStream::GenError ( rtl::OString aUId, String aString ) { CmdBaseStream::GenError ( &aUId, &aString ); } -void RetStream::GenReturn ( USHORT nRet, SmartId aUId, String aString ) +void RetStream::GenReturn ( USHORT nRet, rtl::OString aUId, String aString ) { CmdBaseStream::GenReturn ( nRet, &aUId, &aString ); } -void RetStream::GenReturn ( USHORT nRet, SmartId aUId, SbxValue &aValue ) -{ - Write(USHORT(SIReturn)); - Write(nRet); - Write(&aUId); - Write(USHORT(PARAM_SBXVALUE_1)); // Typ der folgenden Parameter - Write(aValue); -} - -void RetStream::GenReturn ( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool ) +void RetStream::GenReturn ( USHORT nRet, rtl::OString aUId, comm_ULONG nNr, String aString, BOOL bBool ) { CmdBaseStream::GenReturn ( nRet, &aUId, nNr, &aString, bBool ); } -void RetStream::GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString ) +// MacroRecorder +void RetStream::GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString ) { CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString ); } -void RetStream::GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString, BOOL bBool ) +void RetStream::GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, BOOL bBool ) { CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString, bBool ); } +void RetStream::GenReturn ( USHORT nRet, USHORT nMethod, SbxValue &aValue ) +{ + Write(USHORT(SIReturn)); + Write(nRet); + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) + Write(USHORT(PARAM_SBXVALUE_1)); // Typ der folgenden Parameter + Write(aValue); +} + +void RetStream::GenReturn( USHORT nRet, USHORT nMethod, String aString ) +{ + CmdBaseStream::GenReturn ( nRet, nMethod, &aString ); +} + + + + void RetStream::Write( String *pString ) { CmdBaseStream::Write( pString->GetBuffer(), pString->Len() ); @@ -93,16 +103,11 @@ void RetStream::Write( SbxValue &aValue ) aValue.Store( *pSammel ); } -void RetStream::Write( SmartId* pId ) +void RetStream::Write( rtl::OString* pId ) { - DBG_ASSERT( !pId->HasString() || !pId->HasNumeric(), "SmartId contains Number and String. using String only." ); - if ( pId->HasString() ) - { - String aTmp( pId->GetStr() ); - Write( &aTmp ); - } - else - Write( static_cast<comm_ULONG>(pId->GetNum()) ); ////GetNum() ULONG != comm_ULONG on 64bit + //HELPID BACKWARD (should use ByteString or OString) + String aTmp( Id2Str( *pId ) ); + Write( &aTmp ); } diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx index af7b005e1..198f4a3b9 100644 --- a/automation/source/server/retstrm.hxx +++ b/automation/source/server/retstrm.hxx @@ -28,7 +28,6 @@ #define _RETSTRM_HXX #include <basic/sbxvar.hxx> -#include <vcl/smartid.hxx> #include "cmdbasestream.hxx" class SvStream; @@ -41,26 +40,30 @@ public: ~RetStream(); using CmdBaseStream::GenError; -// void GenError( comm_ULONG nError, const comm_UniChar* aString, comm_USHORT nLenInChars ){CmdBaseStream::GenError( nError, aString, nLenInChars );} // new - void GenError( SmartId aUId, String aString ); + void GenError( rtl::OString aUId, String aString ); using CmdBaseStream::GenReturn; void GenReturn( comm_USHORT nRet, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nNr );} - void GenReturn( comm_USHORT nRet, SmartId aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );} - void GenReturn( comm_USHORT nRet, SmartId aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );} + void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );} + void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );} + // MacroRecorder - void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} - void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );} - void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );} + void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} // also used outside MacroRecorder + void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );} + void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );} // new - void GenReturn( USHORT nRet, SmartId aUId, String aString ); - void GenReturn( USHORT nRet, SmartId aUId, SbxValue &aValue ); - void GenReturn( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool ); + void GenReturn( USHORT nRet, rtl::OString aUId, String aString ); + void GenReturn( USHORT nRet, rtl::OString aUId, comm_ULONG nNr, String aString, BOOL bBool ); + +// needed for RemoteCommand and Profiling + void GenReturn( USHORT nRet, USHORT nMethod, SbxValue &aValue ); + void GenReturn( USHORT nRet, USHORT nMethod, String aString ); + // MacroRecorder - void GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString ); - void GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString, BOOL bBool ); + void GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString ); + void GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, BOOL bBool ); void Reset(); SvStream* GetStream(); @@ -75,7 +78,7 @@ public: void Write( SbxValue &aValue ); // Complex Datatypes to be handled system dependent - virtual void Write( SmartId* pId ); + virtual void Write( rtl::OString* pId ); virtual void Write( String *pString ); SvStream *pSammel; diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx index c9ee5c2b6..83d25c6ca 100644 --- a/automation/source/server/server.cxx +++ b/automation/source/server/server.cxx @@ -709,7 +709,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG ) m_bInsideExecutionLoop = FALSE; } - StatementList::aWindowWaitUId = SmartId(); // Warten rücksetzen, da handler sowieso verlassen wird + StatementList::aWindowWaitUId = rtl::OString(); // Warten rücksetzen, da handler sowieso verlassen wird /* if( StatementList::pFirst && !StatementList::bReadingCommands ) // Abfrage nötig, da andere CommandHdl aktiv sein können oder @@ -857,6 +857,9 @@ ImplRemoteControl::ImplRemoteControl() m_pDbgWin = new EditWindow( NULL, CUniString("Debug Window"), WB_VSCROLL ); m_pDbgWin->bQuiet = TRUE; m_pDbgWin->Hide(); + m_pDbgWin->bQuiet = FALSE; + m_pDbgWin->Show(); + StatementList::m_pDbgWin = m_pDbgWin; } #endif diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx index fb7d978fc..1e72204bd 100644 --- a/automation/source/server/sta_list.cxx +++ b/automation/source/server/sta_list.cxx @@ -78,15 +78,15 @@ EditWindow *StatementList::m_pDbgWin; #endif -SmartId StatementList::aWindowWaitUId = SmartId(); +rtl::OString StatementList::aWindowWaitUId = rtl::OString(); Window *StatementList::pWindowWaitPointer = NULL; -SmartId StatementList::aWindowWaitOldHelpId = SmartId(); -SmartId StatementList::aWindowWaitOldUniqueId = SmartId(); +rtl::OString StatementList::aWindowWaitOldHelpId = rtl::OString(); +rtl::OString StatementList::aWindowWaitOldUniqueId = rtl::OString(); USHORT StatementList::nUseBindings = 0; -SmartId StatementList::aSubMenuId1 = SmartId(); // Untermenüs bei PopupMenus -SmartId StatementList::aSubMenuId2 = SmartId(); // erstmal 2-Stufig -SmartId StatementList::aSubMenuId3 = SmartId(); // and now even 3 levels #i31512# +USHORT StatementList::aSubMenuId1 = 0; // Untermenüs bei PopupMenus +USHORT StatementList::aSubMenuId2 = 0; // erstmal 2-Stufig +USHORT StatementList::aSubMenuId3 = 0; // and now even 3 levels #i31512# SystemWindow *StatementList::pMenuWindow = NULL; TTProperties *StatementList::pTTProperties = NULL; @@ -130,7 +130,8 @@ TTSettings* GetTTSettings() -#define IS_WINP_CLOSING(pWin) (pWin->GetSmartHelpId().Matches( 4321 ) && pWin->GetSmartUniqueId().Matches( 1234 )) +// FIXME: HELPID +#define IS_WINP_CLOSING(pWin) (pWin->GetHelpId().equals( "TT_Win_is_closing_HID" ) && pWin->GetUniqueId().equals( "TT_Win_is_closing_UID" )) /* UniString GEN_RES_STR0( ULONG nResId ) { return ResString( nResId ); } @@ -155,7 +156,7 @@ void StatementList::InitProfile() #if OSL_DEBUG_LEVEL > 1 if ( pCurrentProfileStatement != NULL && pCurrentProfileStatement != this ) - pRet->GenReturn( RET_ProfileInfo, SmartId(), CUniString("InitProfile von anderem Statement gerufen ohne SendProfile\n") ); + pRet->GenReturn( RET_ProfileInfo, 0, CUniString("InitProfile von anderem Statement gerufen ohne SendProfile\n") ); #endif pCurrentProfileStatement = this; } @@ -171,18 +172,19 @@ void StatementList::SendProfile( String aText ) pProfiler->EndProfileInterval(); if ( pProfiler->IsProfilingPerCommand() ) - pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileLine( aText ) ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileLine( aText ) ); if ( pProfiler->IsPartitioning() ) - pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileTime ), static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit + // FIXME: HELPID + pRet->GenReturn( RET_ProfileInfo, S_ProfileTime, static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit } if ( pProfiler->IsAutoProfiling() ) - pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetAutoProfiling() ); #if OSL_DEBUG_LEVEL > 1 if ( pCurrentProfileStatement == NULL ) - pRet->GenReturn( RET_ProfileInfo, SmartId(), CUniString("SendProfile ohne InitProfile\n") ); + pRet->GenReturn( RET_ProfileInfo, 0, CUniString("SendProfile ohne InitProfile\n") ); #endif pCurrentProfileStatement = NULL; } @@ -390,7 +392,7 @@ Window* StatementList::SearchClientWin( Window *pBase, Search &aSearch, BOOL May BOOL SearchUID::IsWinOK( Window *pWin ) { - if ( aUId.Matches( pWin->GetSmartUniqueOrHelpId() ) ) + if ( aUId.equals( pWin->GetUniqueOrHelpId() ) ) { if ( ( pWin->IsEnabled() || HasSearchFlag( SEARCH_FIND_DISABLED ) ) && pWin->IsVisible() ) return TRUE; @@ -407,7 +409,7 @@ BOOL SearchUID::IsWinOK( Window *pWin ) USHORT i; for ( i = 0; i < pTB->GetItemCount() ; i++ ) { - if ( aUId.Matches( pTB->GetItemCommand(pTB->GetItemId( i )) ) || aUId.Matches( pTB->GetHelpId(pTB->GetItemId( i )) ) ) + if ( aUId.equals( Str2Id( pTB->GetItemCommand(pTB->GetItemId( i )) ) ) || aUId.equals( pTB->GetHelpId(pTB->GetItemId( i )) ) ) { // ID matches. Window *pItemWin; pItemWin = pTB->GetItemWindow( pTB->GetItemId( i ) ); @@ -455,7 +457,7 @@ BOOL SearchUID::IsWinOK( Window *pWin ) return FALSE; } -Window* StatementList::SearchTree( SmartId aUId ,BOOL bSearchButtonOnToolbox ) +Window* StatementList::SearchTree( rtl::OString aUId ,BOOL bSearchButtonOnToolbox ) { SearchUID aSearch(aUId,bSearchButtonOnToolbox); @@ -974,7 +976,7 @@ String StatementList::ClientTree(Window *pBase, int Indent) WRITE(sIndent); WRITEc("UId : "); - WRITE(UIdString(pBase->GetSmartUniqueOrHelpId())); + WRITE(Id2Str(pBase->GetUniqueOrHelpId())); WRITEc(":0x"); WRITE( String::CreateFromInt64( @@ -1031,7 +1033,7 @@ BOOL StatementList::CheckWindowWait() if ( WinPtrValid(pWindowWaitPointer) && IS_WINP_CLOSING(pWindowWaitPointer) ) { #if OSL_DEBUG_LEVEL > 1 - m_pDbgWin->AddText( aWindowWaitUId.GetText().AppendAscii(" Still Open. RType=") ); + m_pDbgWin->AddText( Id2Str(aWindowWaitUId).AppendAscii(" Still Open. RType=") ); m_pDbgWin->AddText( String::CreateFromInt32( pWindowWaitPointer->GetType() ).AppendAscii("\n") ); #endif @@ -1041,10 +1043,10 @@ BOOL StatementList::CheckWindowWait() #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Close timed out. Going on!! " ); #endif - pWindowWaitPointer->SetSmartHelpId(aWindowWaitOldHelpId, SMART_SET_ALL); - pWindowWaitPointer->SetSmartUniqueId(aWindowWaitOldUniqueId, SMART_SET_ALL); + pWindowWaitPointer->SetHelpId(aWindowWaitOldHelpId); + pWindowWaitPointer->SetUniqueId(aWindowWaitOldUniqueId); - aWindowWaitUId = SmartId(); + aWindowWaitUId = rtl::OString(); pWindowWaitPointer = NULL; StartTime = Time(0L); return TRUE; @@ -1053,7 +1055,7 @@ BOOL StatementList::CheckWindowWait() return FALSE; } pWindowWaitPointer = NULL; - aWindowWaitUId = SmartId(); + aWindowWaitUId = rtl::OString(); #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Closed, Going on.\n" ); #endif @@ -1064,10 +1066,10 @@ BOOL StatementList::CheckWindowWait() void StatementList::ReportError(String aMessage) { - ReportError ( SmartId(), aMessage ); + ReportError ( rtl::OString(), aMessage ); } -void StatementList::ReportError(SmartId aUId, String aMessage) +void StatementList::ReportError(rtl::OString aUId, String aMessage) { pRet->GenError ( aUId, aMessage ); IsError = TRUE; @@ -1081,7 +1083,7 @@ void StatementList::ReportError(String aMessage, ULONG nWhatever) void StatementList::DirectLog( ULONG nType, String aMessage ) { if ( pRet ) - pRet->GenReturn( RET_DirectLoging, SmartId(nType), aMessage ); + pRet->GenReturn( RET_DirectLoging, (USHORT) nType, aMessage ); } diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 40bdedbac..0cdc26a10 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -157,11 +157,11 @@ pfunc_osl_printDebugMessage StatementCommand::pOriginal_osl_DebugMessageFunc = N #define SET_WINP_CLOSING(pWin) \ pWindowWaitPointer = pWin; \ - aWindowWaitUId = pControl->GetSmartUniqueOrHelpId(); \ - aWindowWaitOldHelpId = pWin->GetSmartHelpId(); \ - aWindowWaitOldUniqueId = pWin->GetSmartUniqueId(); \ - pWin->SetSmartHelpId( SmartId(4321) ); \ - pWin->SetSmartUniqueId( SmartId(1234) ); + aWindowWaitUId = pControl->GetUniqueOrHelpId(); \ + aWindowWaitOldHelpId = pWin->GetHelpId(); \ + aWindowWaitOldUniqueId = pWin->GetUniqueId(); \ + pWin->SetHelpId( rtl::OString("TT_Win_is_closing_HID") ); \ + pWin->SetUniqueId( rtl::OString("TT_Win_is_closing_UID") ); // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -302,33 +302,9 @@ BOOL StatementFlow::Execute() // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= // neue Hilfsfunktion, die stetig erweitert werden muss -static short ImpGetRType( Window *pWin, SmartId aUId ) +static short ImpGetRType( Window *pWin ) { - ULONG nUId = aUId.GetNum(); // GetNum() is always zero if no num is defined - // GGGg gggg::gggg gggg::ggLL LLLl::llll llll - DBG_ASSERT( pWin, "missing Parameter" ); - short nRT; - if( (nUId & 0xE0000000) == 0 ) // keine auto ID - nRT = C_NoType; - else { -// if( (nUId & 0x1F) == 0 ) // globale Resource - if( (nUId & 0x1FF) == 0 ) // globale Resource GH: soweit ich das verstanden habe 1FF - nRT = (short)(C_TabPage - 1 + (nUId >> 29)); - else - nRT = (short)((nUId & 0x00003E00) >> 9); - if ( nRT == C_TabPage ) // wegen TabDialog.UId = TabPage.UId - nRT = C_NoType; - else - { -#ifndef DBG_UTIL - return nRT; -#endif - } - } - -#ifdef DBG_UTIL - short n = nRT; -#endif + short nRT = C_NoType; WindowType eRT = pWin->GetType(); switch( eRT ) { case WINDOW_WINDOW: nRT = C_Window ; break; @@ -394,15 +370,6 @@ static short ImpGetRType( Window *pWin, SmartId aUId ) case WINDOW_DIALOG: nRT = C_Dialog; break; } -#ifdef DBG_UTIL - // Die Werte n sind bei den WindowTypen nicht mehr vergeben, werden aber in der AutoID noch verwendet - // Sie werden jetzt durch den Typ nRT implementiert. - DBG_ASSERT( n == C_NoType || n == nRT - || ( n == C_ImageButton && nRT == C_PushButton ) - || ( n == C_TriStateBox && nRT == C_CheckBox ) - || ( n == C_ImageRadioButton && nRT == C_RadioButton ) - , "error in algorithm" ); -#endif return nRT; } @@ -591,9 +558,9 @@ BOOL StatementSlot::Execute() if ( !bMenuClosed ) { pPopup->EndExecute(0); - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; bMenuClosed = TRUE; #if OSL_DEBUG_LEVEL > 1 @@ -715,12 +682,12 @@ BOOL StatementSlot::Execute() { case TT_PR_ERR_NODISPATCHER: { - ReportError( SmartId(nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED_NO_DISPATCHER ) ); + ReportError( rtl::OString::valueOf((sal_Int32)nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED_NO_DISPATCHER ) ); } break; case TT_PR_ERR_NOEXECUTE: { - ReportError(SmartId(nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED ) ); + ReportError( rtl::OString::valueOf((sal_Int32)nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED ) ); } break; } @@ -759,7 +726,6 @@ StatementUnoSlot::StatementUnoSlot(SCmdStream *pIn) StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId, USHORT Params, USHORT Nr1 ) : nMethodId( MethodId ) -, aSmartMethodId() , nParams(Params) , nNr1(Nr1) , nNr2(0) @@ -772,12 +738,11 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId, , bBool2(FALSE) { QueStatement( pAfterThis ); - aSmartMethodId = SmartId( nMethodId ); #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Directly adding Conmmand:" ); m_pDbgWin->AddText( " Methode: " ); - m_pDbgWin->AddText( aSmartMethodId.GetText() ); + m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) ); m_pDbgWin->AddText( " Params:" ); if( nParams & PARAM_USHORT_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );} if( nParams & PARAM_USHORT_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );} @@ -795,7 +760,6 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId, StatementCommand::StatementCommand( SCmdStream *pCmdIn ) : nMethodId(0) -, aSmartMethodId() , nParams(0) , nNr1(0) , nNr2(0) @@ -809,7 +773,6 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn ) { QueStatement( NULL ); pCmdIn->Read( nMethodId ); - aSmartMethodId = SmartId( nMethodId ); pCmdIn->Read( nParams ); if( nParams & PARAM_USHORT_1 ) pCmdIn->Read( nNr1 ); @@ -825,7 +788,7 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn ) #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Reading Conmmand:" ); m_pDbgWin->AddText( " Methode: " ); - m_pDbgWin->AddText( aSmartMethodId.GetText() ); + m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) ); m_pDbgWin->AddText( " Params:" ); if( nParams & PARAM_USHORT_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );} if( nParams & PARAM_USHORT_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );} @@ -866,7 +829,7 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst return; if ( bFirst ) - pRet->GenReturn ( RET_WinInfo, SmartId(), (comm_ULONG)nConf | DH_MODE_DATA_VALID, UniString(), TRUE ); + pRet->GenReturn ( RET_WinInfo, rtl::OString(), (comm_ULONG)nConf | DH_MODE_DATA_VALID, UniString(), TRUE ); if ( bFirst ) { @@ -943,8 +906,9 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst break; default: - if ( pBase->GetSmartUniqueOrHelpId().Equals( SmartId() ) && !( nConf & DH_MODE_ALLWIN ) ) + if ( ( pBase->GetUniqueOrHelpId().getLength() == 0 ) && !( nConf & DH_MODE_ALLWIN ) ) bSkip = TRUE; + break; } if ( !bSkip ) @@ -974,13 +938,9 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst aTypeSuffix.AppendAscii( "/Unknown", 8 ); } - SmartId aId = pBase->GetSmartUniqueOrHelpId(); - if ( aId.HasString() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( aId.GetStr() ), (comm_ULONG)pBase->GetType(), - TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), FALSE ); - if ( !aId.HasString() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( aId.GetNum() ), (comm_ULONG)pBase->GetType(), - TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), FALSE ); + rtl::OString aId = pBase->GetUniqueOrHelpId(); + pRet->GenReturn ( RET_WinInfo, aId, (comm_ULONG)pBase->GetType(), + TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), FALSE ); if ( pBase->GetType() == WINDOW_TOOLBOX ) // Buttons und Controls auf Toolboxen. @@ -1002,10 +962,10 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst if ( pTB->GetItemType( i ) == TOOLBOXITEM_BUTTON && ( !pItemWin || !pItemWin->IsVisible() ) ) { if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BUTTON, + pRet->GenReturn ( RET_WinInfo, Str2Id(pTB->GetItemCommand(pTB->GetItemId( i ))), (comm_ULONG)WINDOW_BUTTON, TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), FALSE ); if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BUTTON, + pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_ULONG)WINDOW_BUTTON, TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), FALSE ); } else @@ -1013,10 +973,10 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst if ( pItemWin ) { if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)pItemWin->GetType(), + pRet->GenReturn ( RET_WinInfo, Str2Id(pTB->GetItemCommand(pTB->GetItemId( i ))), (comm_ULONG)pItemWin->GetType(), TypeString(pItemWin->GetType()).AppendAscii(": ").Append(aName), FALSE ); if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)pItemWin->GetType(), + pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_ULONG)pItemWin->GetType(), TypeString(pItemWin->GetType()).AppendAscii(": ").Append(aName), FALSE ); USHORT ii; for( ii = 0 ; ii < pItemWin->GetChildCount(); ii++ ) @@ -1048,10 +1008,10 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst DBG_ERROR1( "Unknown TOOLBOXITEM %i", pTB->GetItemType( i ) ); } if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE, + pRet->GenReturn ( RET_WinInfo, Str2Id( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE, aToolBoxItemType.AppendAscii(": ").Append(aName), FALSE ); if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE, + pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_ULONG)WINDOW_BASE, aToolBoxItemType.AppendAscii(": ").Append(aName), FALSE ); } } @@ -1076,35 +1036,35 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst aName = String(); if ( aName.Len() == 0 ) aName = pBD->GetPushButton( pBD->GetButtonId(i) )->GetText(); - String aID; + ByteString aID; switch ( pBD->GetButtonId(i) ) { case BUTTONID_OK: - aID.AssignAscii("Ok"); + aID.Assign("Ok"); break; case BUTTONID_CANCEL: - aID.AssignAscii("Cancel"); + aID.Assign("Cancel"); break; case BUTTONID_YES: - aID.AssignAscii("Yes"); + aID.Assign("Yes"); break; case BUTTONID_NO: - aID.AssignAscii("No"); + aID.Assign("No"); break; case BUTTONID_RETRY: - aID.AssignAscii("Retry"); + aID.Assign("Retry"); break; case BUTTONID_HELP: - aID.AssignAscii("Help"); + aID.Assign("Help"); break; default: - aID = UniString::CreateFromInt32( pBD->GetButtonId(i) ); + aID = ByteString::CreateFromInt32( pBD->GetButtonId(i) ); break; } - pRet->GenReturn ( RET_WinInfo, SmartId( aID ), (comm_ULONG)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(), // So daß der Text angezeigt wird! + pRet->GenReturn ( RET_WinInfo, aID, (comm_ULONG)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(), // So daß der Text angezeigt wird! TypeString(pBD->GetPushButton( pBD->GetButtonId(i) )->GetType()).AppendAscii(": ").Append(aName) - .AppendAscii(" ButtonId = ").Append(aID), FALSE ); + .AppendAscii(" ButtonId = ").AppendAscii( aID.GetBuffer() ), FALSE ); } return; // ButtonDialog ist hier schon komplett abgehandelt. @@ -1151,10 +1111,10 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst DBG_ERROR1( "Unknown MENUITEM %i", pMenu->GetItemType( i ) ); } if ( pMenu->GetItemCommand(nID).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( pMenu->GetItemCommand(nID) ), (comm_ULONG)0, + pRet->GenReturn ( RET_WinInfo, Str2Id( pMenu->GetItemCommand(nID) ), (comm_ULONG)0, aMenuItemType.AppendAscii(": ").Append(aName), FALSE ); if ( !pMenu->GetItemCommand(nID).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( nID ), (comm_ULONG)0, + pRet->GenReturn ( RET_WinInfo, rtl::OString::valueOf( (sal_Int32)nID ), (comm_ULONG)0, aMenuItemType.AppendAscii(": ").Append(aName), FALSE ); } } @@ -1571,10 +1531,10 @@ BOOL StatementCommand::DisplayHID() if ( GetTTSettings()->Act ) { SET_WIN(GetTTSettings()->Act); - GetTTSettings()->pDisplayHidWin->SetDisplayText(GetTTSettings()->Act->GetSmartUniqueOrHelpId().GetText().AppendAscii(" WinType: ") + GetTTSettings()->pDisplayHidWin->SetDisplayText( Id2Str(GetTTSettings()->Act->GetUniqueOrHelpId()).AppendAscii(" WinType: ") .Append(UniString::CreateFromInt64(GetTTSettings()->Act->GetType())).AppendAscii(" ").Append(GetTTSettings()->Act->GetText())); - if ( GetTTSettings()->Act && !GetTTSettings()->Act->GetSmartUniqueId().Equals( GetTTSettings()->Act->GetSmartHelpId() ) ) - GetTTSettings()->pDisplayHidWin->SetText(UniString( TTProperties::GetSvtResId( TT_ALTERNATE_CAPTION ) ).Append(GetTTSettings()->Act->GetSmartHelpId().GetText())); + if ( GetTTSettings()->Act && !GetTTSettings()->Act->GetUniqueId().equals( GetTTSettings()->Act->GetHelpId() ) ) + GetTTSettings()->pDisplayHidWin->SetText(UniString( TTProperties::GetSvtResId( TT_ALTERNATE_CAPTION ) ).AppendAscii(GetTTSettings()->Act->GetHelpId().getStr())); else GetTTSettings()->pDisplayHidWin->SetText( GetTTSettings()->aOriginalCaption ); } @@ -1584,9 +1544,10 @@ BOOL StatementCommand::DisplayHID() else if ( GetTTSettings()->Act ) { // SET_WIN(GetTTSettings()->Act); - if ( GetTTSettings()->pDisplayHidWin->IsDisplayTextModified() && GetTTSettings()->pDisplayHidWin->GetDisplayText().Len() > 0 ) + // allow setting a HelpID manually (just enter the ID in the displayHID Window and terminate it by | + if ( GetTTSettings()->pDisplayHidWin->IsDisplayTextModified() && GetTTSettings()->pDisplayHidWin->GetDisplayText().GetTokenCount( '|' ) > 1 ) { - GetTTSettings()->Act->SetSmartUniqueId( SmartId( GetTTSettings()->pDisplayHidWin->GetDisplayText().ToInt32() ) ); + GetTTSettings()->Act->SetUniqueId( Str2Id( GetTTSettings()->pDisplayHidWin->GetDisplayText().GetToken( '|' ) ) ); GetTTSettings()->pDisplayHidWin->ClearDisplayTextModified(); } } @@ -2122,16 +2083,16 @@ void TranslateWin::EnableTranslation() void StatementCommand::Translate() { // Es wurde eine initale UniqueId mitgegeben. Dann nur die dopelten Shortcuts liefern - if( (nParams & PARAM_ULONG_1) && nLNr1 ) + if( (nParams & PARAM_STR_1) && nLNr1 ) { String aDouble; - Window *pWin = SearchTree( SmartId( nLNr1 ) ,FALSE ); + Window *pWin = SearchTree( Str2Id( aString1 ) ,FALSE ); if ( pWin ) { pWin = pWin->GetWindow( WINDOW_OVERLAP ); aDouble = TranslateWin::MarkShortcutErrors( pWin, TRUE ); } - pRet->GenReturn ( RET_Value, aSmartMethodId, aDouble ); + pRet->GenReturn ( RET_Value, nMethodId, aDouble ); return; } @@ -2164,14 +2125,14 @@ void StatementCommand::Translate() { Window* pNew = pTranslationWindow->GetWindow( WINDOW_CLIENT ); // Bei Dockingwindoes das kanze Geraffel von Docking Floating überspringen - while ( IsDialog( pNew ) && !pNew->GetSmartUniqueOrHelpId().HasAny() && pNew->GetChildCount() == 1 ) + while ( IsDialog( pNew ) && !pNew->GetUniqueOrHelpId().getLength() && pNew->GetChildCount() == 1 ) pNew = pNew->GetChild( 0 ); pTranslationWindow = pNew; } aTranslation = CUniString("0;"); - aTranslation += pTranslationWindow->GetSmartUniqueOrHelpId().GetText(); + aTranslation += Id2Str( pTranslationWindow->GetUniqueOrHelpId() ); aTranslation += ';'; aTranslation += TypeString( pTranslationWindow->GetType() ); @@ -2185,7 +2146,7 @@ void StatementCommand::Translate() if ( pParentDialog ) { - aTranslation += pParentDialog->GetSmartUniqueOrHelpId().GetText(); + aTranslation += Id2Str(pParentDialog->GetUniqueOrHelpId()); aTranslation += ';'; aTranslation += TypeString( pParentDialog->GetType() ); } @@ -2214,13 +2175,13 @@ void StatementCommand::Translate() // alle TABSs quoten () aTranslation.SearchAndReplaceAll( CUniString("\t"), CUniString("\\t") ); - pRet->GenReturn ( RET_Value, aSmartMethodId, aTranslation ); + pRet->GenReturn ( RET_Value, nMethodId, aTranslation ); GetTTSettings()->pTranslateWin->EnableTranslation(); GetTTSettings()->bToTop = TRUE; } else { - pRet->GenReturn ( RET_Value, aSmartMethodId, String() ); + pRet->GenReturn ( RET_Value, nMethodId, String() ); GetTTSettings()->pTranslateWin->EnableTranslation(); ErrorBox err( GetTTSettings()->pTranslateWin, TTProperties::GetSvtResId( TT_NO_CONTROL )); err.Execute(); @@ -2230,7 +2191,7 @@ void StatementCommand::Translate() } else if ( GetTTSettings()->pTranslateWin->IsNextDialog() ) { - pRet->GenReturn ( RET_Value, aSmartMethodId, CUniString("1") ); + pRet->GenReturn ( RET_Value, nMethodId, CUniString("1") ); GetTTSettings()->pTranslateWin->ResetNextDialog(); GetTTSettings()->pTranslateWin->LoseFocus(); GetTTSettings()->bToTop = TRUE; @@ -2238,7 +2199,7 @@ void StatementCommand::Translate() else { GetTTSettings()->pTranslateWin->EnableTranslation(); - pRet->GenReturn ( RET_Value, aSmartMethodId, String() ); + pRet->GenReturn ( RET_Value, nMethodId, String() ); } } @@ -2326,7 +2287,7 @@ BOOL StatementCommand::Execute() { #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Skipping Command: " ); - m_pDbgWin->AddText( aSmartMethodId.GetText() ); + m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) ); m_pDbgWin->AddText( "\n" ); #endif @@ -2338,7 +2299,7 @@ BOOL StatementCommand::Execute() InitProfile(); #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Executing Command: " ); - m_pDbgWin->AddText( aSmartMethodId.GetText() ); + m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) ); m_pDbgWin->AddText( "\n" ); #endif @@ -2349,7 +2310,7 @@ BOOL StatementCommand::Execute() #if OSL_DEBUG_LEVEL > 1 #define REPORT_WIN_CLOSED(pControl, aInfo) \ _REPORT_WIN_CLOSED(pControl, aInfo) \ - m_pDbgWin->AddText( aInfo.AppendAscii(" \"").Append( pControl->GetText() ).AppendAscii("\" geschlossen, RType = ").Append( TypeString(pControl->GetType()) ).AppendAscii(", UId = ").Append( UIdString(pControl->GetSmartUniqueOrHelpId()) ) ); + m_pDbgWin->AddText( aInfo.AppendAscii(" \"").Append( pControl->GetText() ).AppendAscii("\" geschlossen, RType = ").Append( TypeString(pControl->GetType()) ).AppendAscii(", UId = ").Append( UIdString( pControl->GetUniqueOrHelpId() ) ) ); #else #define REPORT_WIN_CLOSED(pControl, aInfo) _REPORT_WIN_CLOSED(pControl, aInfo) #endif @@ -2366,7 +2327,7 @@ BOOL StatementCommand::Execute() aString1.AppendAscii("\" geschlossen, RType = ");\ aString1 += TypeString(pControl->GetType()); \ aString1.AppendAscii(", UId = "); \ - aString1 += UIdString(pControl->GetSmartUniqueOrHelpId()); + aString1 += UIdString(pControl->GetUniqueOrHelpId()); switch ( nMethodId ) @@ -2399,9 +2360,9 @@ BOOL StatementCommand::Execute() bCatchGPF = TRUE; bUsePostEvents = TRUE; - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; } if ( !nRetryCount ) @@ -2422,12 +2383,12 @@ BOOL StatementCommand::Execute() && pControl->GetType() != WINDOW_BORDERWINDOW && nRetryCount-- ) { - short nRT = ImpGetRType( pControl, pControl->GetSmartUniqueOrHelpId() ); + short nRT = ImpGetRType( pControl ); if ( nRT == C_TabControl && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG ) { // Bei Tabcontrol den zugehörigen Tabdialog nehmen pControl = pControl->GET_REAL_PARENT(); - nRT = ImpGetRType( pControl, pControl->GetSmartUniqueOrHelpId() ); + nRT = ImpGetRType( pControl ); } switch( nRT ) @@ -2595,7 +2556,7 @@ BOOL StatementCommand::Execute() if ( Time().GetTime() < long(nLNr1) ) // Aktuelle Zeit kleiner Endzeit return FALSE; else - pRet->GenReturn ( RET_Value, aSmartMethodId, aString1); + pRet->GenReturn ( RET_Value, nMethodId, aString1); } break; case RC_WaitSlot: @@ -2609,12 +2570,12 @@ BOOL StatementCommand::Execute() } if ( !bIsSlotInExecute ) - pRet->GenReturn ( RET_Value, aSmartMethodId, comm_USHORT(CONST_WSFinished) ); + pRet->GenReturn ( RET_Value, nMethodId, comm_USHORT(CONST_WSFinished) ); else { if ( Time().GetTime() < long(nLNr1) ) // Aktuelle Zeit kleiner Endzeit return FALSE; - pRet->GenReturn ( RET_Value, aSmartMethodId, comm_USHORT(CONST_WSTimeout) ); + pRet->GenReturn ( RET_Value, nMethodId, comm_USHORT(CONST_WSTimeout) ); } } break; @@ -2666,21 +2627,21 @@ BOOL StatementCommand::Execute() ReportError( GEN_RES_STR0( S_NO_ACTIVE_WINDOW ) ); // if ( Application::GetAppWindow() ) // bWait = Application::GetAppWindow()->IsWait(); - pRet->GenReturn ( RET_Value, aSmartMethodId, bWait ); + pRet->GenReturn ( RET_Value, nMethodId, bWait ); break; } case RC_GetClipboard: { ::rtl::OUString aTemp; ::svt::OStringTransfer::PasteString( aTemp, GetFirstDocFrame() ); - pRet->GenReturn ( RET_Value, aSmartMethodId, String( aTemp ) ); + pRet->GenReturn ( RET_Value, nMethodId, String( aTemp ) ); } break; case RC_SetClipboard: ::svt::OStringTransfer::CopyString(aString1,GetFirstDocFrame()); break; case RC_WinTree: - pRet->GenReturn ( RET_Value, aSmartMethodId, Tree( NULL, 0)); + pRet->GenReturn ( RET_Value, nMethodId, Tree( NULL, 0)); break; #if OSL_DEBUG_LEVEL > 1 case RC_NoDebug: @@ -2704,7 +2665,9 @@ BOOL StatementCommand::Execute() else if ( !IsDialog(pWin) ) ReportError( GEN_RES_STR0( S_NO_DIALOG_IN_GETACTIVE ) ); else - pRet->GenReturn( RET_Value, aSmartMethodId, static_cast<comm_ULONG>(pWin->GetSmartUniqueOrHelpId().GetNum())); //GetNum() ULONG != comm_ULONG on 64bit + { + pRet->GenReturn( RET_Value, nMethodId, Id2Str(pWin->GetUniqueOrHelpId()) ); + } } break; case RC_UseBindings: @@ -2737,7 +2700,7 @@ BOOL StatementCommand::Execute() pProfiler->StartAutoProfiling( nNr1 ); // Der Header ist abhängig vom Modus - pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileHeader() ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileHeader() ); } else if ( nParams & PARAM_USHORT_1 ) { // Partitioning initialisieren: Profile true [,nNr][,nNr][,nNr][,nNr] @@ -2750,32 +2713,32 @@ BOOL StatementCommand::Execute() // Hier werden die Parameter ans Testtool zurück übertragen. // Das ist zwar etwas eigenartig, aber ansonsten müsste man im Testtool // die einfache Struktur der Remotebefehle aufbrechen. - pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileReset ), nAnzahl ); + pRet->GenReturn( RET_ProfileInfo, S_ProfileReset, nAnzahl ); // Und die einzelnen Grenzen - if ( nParams & PARAM_USHORT_1 ) { pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileBorder1 ), (comm_ULONG)nNr1 ); }; - if ( nParams & PARAM_USHORT_2 ) { pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileBorder2 ), (comm_ULONG)nNr2 ); }; - if ( nParams & PARAM_USHORT_3 ) { pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileBorder3 ), (comm_ULONG)nNr3 ); }; - if ( nParams & PARAM_USHORT_4 ) { pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileBorder4 ), (comm_ULONG)nNr4 ); }; + if ( nParams & PARAM_USHORT_1 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder1, (comm_ULONG)nNr1 ); }; + if ( nParams & PARAM_USHORT_2 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder2, (comm_ULONG)nNr2 ); }; + if ( nParams & PARAM_USHORT_3 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder3, (comm_ULONG)nNr3 ); }; + if ( nParams & PARAM_USHORT_4 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder4, (comm_ULONG)nNr4 ); }; pProfiler->StartPartitioning(); } else if( nParams == PARAM_STR_1 ) // Genau ein String! { // Nur einen String ins Profiling aufnehmen aString1 += '\n'; - pRet->GenReturn( RET_ProfileInfo, SmartId(), aString1 ); + pRet->GenReturn( RET_ProfileInfo, 0, aString1 ); } else { // Normales Profiling je Kommando: profile if ( pProfiler->IsAutoProfiling() ) { - pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetAutoProfiling() ); pProfiler->StopAutoProfiling(); } pProfiler->StartProfilingPerCommand(); // Der Header ist abhängig vom Modus - pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileHeader() ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileHeader() ); } } else // Profiling wieder ausschalten: Profile false @@ -2786,13 +2749,13 @@ BOOL StatementCommand::Execute() if ( pProfiler->IsAutoProfiling() ) { - pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetAutoProfiling() ); pProfiler->StopAutoProfiling(); } if ( pProfiler->IsPartitioning() ) { - pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileDump ), (comm_ULONG)0 ); + pRet->GenReturn( RET_ProfileInfo, S_ProfileDump, (comm_ULONG)0 ); pProfiler->StopPartitioning(); } @@ -2890,13 +2853,13 @@ BOOL StatementCommand::Execute() { case RC_MenuGetItemCount: { - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)nItemCount ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)nItemCount ); } break; case RC_MenuGetItemId: { - if ( ValueOK(aSmartMethodId, RcString( nMethodId ),nNr1,nItemCount) ) - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)pMenu->GetItemId(nPhysicalIndex-1) ); + if ( ValueOK( rtl::OString(), RcString( nMethodId ),nNr1,nItemCount) ) + pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pMenu->GetItemId(nPhysicalIndex-1) ); } break; case RC_MenuGetItemPos: @@ -2918,50 +2881,50 @@ BOOL StatementCommand::Execute() } } } - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)(nLogicalPos+1) ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)(nLogicalPos+1) ); } break; case RC_MenuIsSeperator: { - if ( ValueOK(aSmartMethodId, RcString( nMethodId ),nNr1,nItemCount) ) - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)(pMenu->GetItemType(nPhysicalIndex-1) == MENUITEM_SEPARATOR) ); + if ( ValueOK( rtl::OString(), RcString( nMethodId ),nNr1,nItemCount) ) + pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)(pMenu->GetItemType(nPhysicalIndex-1) == MENUITEM_SEPARATOR) ); } break; case RC_MenuIsItemChecked: { - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)pMenu->IsItemChecked(nNr1) ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)pMenu->IsItemChecked(nNr1) ); } break; case RC_MenuIsItemEnabled: { - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)pMenu->IsItemEnabled(nNr1) ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)pMenu->IsItemEnabled(nNr1) ); } break; case RC_MenuGetItemText: { - pRet->GenReturn ( RET_Value, aSmartMethodId, (String)pMenu->GetItemText(nNr1) ); + pRet->GenReturn ( RET_Value, nMethodId, (String)pMenu->GetItemText(nNr1) ); } break; case RC_MenuGetItemCommand: { - pRet->GenReturn ( RET_Value, aSmartMethodId, (String)pMenu->GetItemCommand(nNr1) ); + pRet->GenReturn ( RET_Value, nMethodId, (String)pMenu->GetItemCommand(nNr1) ); } break; case RC_MenuHasSubMenu: { - pRet->GenReturn ( RET_Value, aSmartMethodId, (BOOL)(pMenu->GetPopupMenu(nNr1) != NULL) ); + pRet->GenReturn ( RET_Value, nMethodId, (BOOL)(pMenu->GetPopupMenu(nNr1) != NULL) ); } break; case RC_MenuSelect: { if ( pMenu->GetPopupMenu(nNr1) ) { - if ( !aSubMenuId1.GetNum() ) - aSubMenuId1 = SmartId(nNr1); - else if ( !aSubMenuId2.GetNum() ) - aSubMenuId2 = SmartId(nNr1); - else if ( !aSubMenuId3.GetNum() ) - aSubMenuId3 = SmartId(nNr1); + if ( !aSubMenuId1 ) + aSubMenuId1 = nNr1; + else if ( !aSubMenuId2 ) + aSubMenuId2 = nNr1; + else if ( !aSubMenuId3 ) + aSubMenuId3 = nNr1; if ( pPopup ) pPopup->SelectEntry(nNr1); @@ -2973,17 +2936,17 @@ BOOL StatementCommand::Execute() if ( pPopup ) { pPopup->EndExecute(nNr1); - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; } else { pMenuBar->SelectEntry(nNr1); - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; } } @@ -3083,13 +3046,6 @@ BOOL StatementCommand::Execute() nDirFlags = nFlags = Sb_ATTR_HIDDEN | Sb_ATTR_SYSTEM | Sb_ATTR_DIRECTORY; // Nur diese Bitmaske ist unter Windows erlaubt - #ifdef WIN - if( nFlags & ~0x1E ) - { - nDirFlags = 0; - StarBASIC::Error( SbERR_BAD_ARGUMENT ); - } - #endif // Sb_ATTR_VOLUME wird getrennt gehandelt if( nDirFlags & Sb_ATTR_VOLUME ) aPath = aEntry.GetVolume(); @@ -3121,36 +3077,12 @@ BOOL StatementCommand::Execute() } DirEntry aNextEntry=(*(pDir))[nDirPos++]; aPath = aNextEntry.GetName(); //Full(); - #ifdef WIN - aNextEntry.ToAbs(); - String sFull(aNextEntry.GetFull()); - unsigned nFlags; - - if (_dos_getfileattr( sFull.GetStr(), &nFlags )) - nErrorcode = FSYS_ERR_NOTEXISTS; - else - { - INT16 nCurFlags = nDirFlags; - if( (nCurFlags == Sb_ATTR_NORMAL) - && !(nFlags & ( _A_HIDDEN | _A_SYSTEM | _A_VOLID | _A_SUBDIR ) ) ) - break; - else if( (nCurFlags & Sb_ATTR_HIDDEN) && (nFlags & _A_HIDDEN) ) - break; - else if( (nCurFlags & Sb_ATTR_SYSTEM) && (nFlags & _A_SYSTEM) ) - break; - else if( (nCurFlags & Sb_ATTR_VOLUME) && (nFlags & _A_VOLID) ) - break; - else if( (nCurFlags & Sb_ATTR_DIRECTORY) && (nFlags & _A_SUBDIR) ) - break; - } - #else break; - #endif } } if ( !nErrorcode ) { - pRet->GenReturn ( RET_Value, aSmartMethodId, aPath ); + pRet->GenReturn ( RET_Value, nMethodId, aPath ); } @@ -3182,9 +3114,9 @@ BOOL StatementCommand::Execute() if ( !aFS.IsKind( FSYS_KIND_WILD ) && !aFS.IsKind( FSYS_KIND_DIR ) && aEntry.Exists() ) { // Sonderbehandlung für genau einen Eintrag if ( !aFS.IsKind( FSYS_KIND_DIR ) && ( aDirEntryKind == FSYS_KIND_DIR ) ) - pRet->GenReturn ( RET_Value, aSmartMethodId, String() ); + pRet->GenReturn ( RET_Value, nMethodId, String() ); else - pRet->GenReturn ( RET_Value, aSmartMethodId, (String)(aEntry.GetName()) ); + pRet->GenReturn ( RET_Value, nMethodId, (String)(aEntry.GetName()) ); break; } @@ -3199,12 +3131,12 @@ BOOL StatementCommand::Execute() if ( !pDir ) pDir = new Dir; - if ( !nErrorcode && ValueOK( aSmartMethodId, GEN_RES_STR0( S_NO_MORE_FILES ), nDirPos+1, pDir->Count()+1 ) ) + if ( !nErrorcode && ValueOK( nMethodId, GEN_RES_STR0( S_NO_MORE_FILES ), nDirPos+1, pDir->Count()+1 ) ) { if ( nDirPos == pDir->Count() ) - pRet->GenReturn ( RET_Value, aSmartMethodId, String() ); + pRet->GenReturn ( RET_Value, nMethodId, String() ); else - pRet->GenReturn ( RET_Value, aSmartMethodId, (String)((*pDir)[ nDirPos ].GetName()) ); + pRet->GenReturn ( RET_Value, nMethodId, (String)((*pDir)[ nDirPos ].GetName()) ); nDirPos++; }*/ } @@ -3216,7 +3148,7 @@ BOOL StatementCommand::Execute() if ( FSYS_ERR_OK == nErrorcode ) { FileStat aFS( aFile ); - pRet->GenReturn ( RET_Value, aSmartMethodId, static_cast<comm_ULONG>(aFS.GetSize()) ); //GetSize() ULONG != comm_ULONG on 64bit + pRet->GenReturn ( RET_Value, nMethodId, static_cast<comm_ULONG>(aFS.GetSize()) ); //GetSize() ULONG != comm_ULONG on 64bit nErrorcode = aFS.GetError(); } } @@ -3243,7 +3175,7 @@ BOOL StatementCommand::Execute() SbxValueRef xValue = new SbxValue( SbxDATE ); xValue->PutDate( fSerial ); - pRet->GenReturn ( RET_Value, aSmartMethodId, *xValue ); + pRet->GenReturn ( RET_Value, nMethodId, *xValue ); } } break; @@ -3359,7 +3291,7 @@ BOOL StatementCommand::Execute() aPointer = Pointer( POINTER_NULL ); } } - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)aPointer.GetStyle() ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)aPointer.GetStyle() ); } break; case RC_UnpackStorage: @@ -3428,7 +3360,7 @@ BOOL StatementCommand::Execute() break; case RC_ExistsSysDialog: { - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)xPicker.is() ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)xPicker.is() ); } break; default: @@ -3469,14 +3401,14 @@ BOOL StatementCommand::Execute() break; case RC_GetDocumentCount : { - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_USHORT)GetDocWinCount() ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_USHORT)GetDocWinCount() ); } break; case RC_ActivateDocument : { if( nParams & PARAM_USHORT_1 ) { - if ( ValueOK(aSmartMethodId, RcString( nMethodId ), nNr1, GetDocWinCount() ) ) + if ( ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, GetDocWinCount() ) ) { Window* pWin = GetDocWin( nNr1-1 ); if ( pWin ) @@ -3492,7 +3424,7 @@ BOOL StatementCommand::Execute() break; case RC_GetSystemLanguage : { - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_USHORT)Application::GetSettings().GetLanguage() ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_USHORT)Application::GetSettings().GetLanguage() ); } break; case RC_CatchGPF : @@ -3511,7 +3443,7 @@ BOOL StatementCommand::Execute() #else bIsProduct = TRUE; #endif - pRet->GenReturn ( RET_Value, aSmartMethodId, (BOOL)bIsProduct ); + pRet->GenReturn ( RET_Value, nMethodId, (BOOL)bIsProduct ); } break; case RC_UsePostEvents : @@ -3590,17 +3522,22 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType ) , bBool2(FALSE) { QueStatement( NULL ); + //HELPID BACKWARD (SIControl is no longer needed) if ( nControlIdType == SIControl ) { comm_ULONG nId; pCmdIn->Read( nId ); - aUId = SmartId( nId ); + aUId = rtl::OString( nId ); + if ( nId == 0 ) + aUId = UID_ACTIVE; + else + ReportError( aUId, GEN_RES_STR1c( S_INTERNAL_ERROR, "using numeric HelpID from old Testtool" ) ); } else if ( nControlIdType == SIStringControl ) { String aId; pCmdIn->Read( aId ); - aUId = SmartId( aId ); + aUId = Str2Id( aId ); } else { @@ -3622,7 +3559,7 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType ) #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Reading Control: UId: " ); - m_pDbgWin->AddText( aUId.GetText() ); + m_pDbgWin->AddText( Id2Str( aUId ) ); m_pDbgWin->AddText( " Methode: " ); m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) ); m_pDbgWin->AddText( " Params:" ); @@ -3711,7 +3648,7 @@ BOOL StatementControl::ControlOK( Window *pControl, const sal_Char* cBezeichnung { if ( pControl && ( ( ( IsAccessable(pControl) || (nMethodId & M_WITH_RETURN) ) && pControl->IsVisible() ) || - aUId.Matches( UID_ACTIVE ) ) ) + aUId.equals( UID_ACTIVE ) ) ) return TRUE; else { @@ -3734,7 +3671,7 @@ BOOL StatementControl::ControlOK( Window *pControl, const sal_Char* cBezeichnung } -BOOL StatementList::ValueOK( SmartId aId, String aBezeichnung, ULONG nValue, ULONG nMax ) +BOOL StatementList::ValueOK( rtl::OString aId, String aBezeichnung, ULONG nValue, ULONG nMax ) { if ( nMax < nValue ) @@ -3768,24 +3705,21 @@ USHORT StatementList::GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, if ( !pMenu ) return 1; - if ( aSubMenuId1.GetNum() ) + if ( aSubMenuId1 ) { - pPopup = pMenu->GetPopupMenu( - sal::static_int_cast< USHORT >(aSubMenuId1.GetNum())); + pPopup = pMenu->GetPopupMenu( aSubMenuId1 ); pMenu = pPopup; } - if ( pMenu && aSubMenuId2.GetNum() ) + if ( pMenu && aSubMenuId2 ) { - pPopup = pMenu->GetPopupMenu( - sal::static_int_cast< USHORT >(aSubMenuId2.GetNum())); + pPopup = pMenu->GetPopupMenu( aSubMenuId2 ); pMenu = pPopup; } - if ( pMenu && aSubMenuId3.GetNum() ) + if ( pMenu && aSubMenuId3 ) { - pPopup = pMenu->GetPopupMenu( - sal::static_int_cast< USHORT >(aSubMenuId3.GetNum())); + pPopup = pMenu->GetPopupMenu( aSubMenuId3 ); pMenu = pPopup; } @@ -4313,9 +4247,9 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) break; case M_OpenContextMenu: { - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; Point aPos; ToolBox* pTB = (ToolBox*)pControl; @@ -4349,9 +4283,9 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) break; case M_UseMenu: { - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; while ( pControl && !( ( pControl->GetType() == WINDOW_SYSWINDOW || pControl->GetType() == WINDOW_WORKWINDOW ) && ControlOK( pControl, "" ) ) ) @@ -4577,7 +4511,7 @@ BOOL StatementControl::Execute() { #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Skipping Window: " ); - m_pDbgWin->AddText( aUId.GetText() ); + m_pDbgWin->AddText( Id2Str( aUId ) ); m_pDbgWin->AddText( " Method: " ); m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) ); m_pDbgWin->AddText( "\n" ); @@ -4590,14 +4524,14 @@ BOOL StatementControl::Execute() InitProfile(); #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Executing Window: " ); - m_pDbgWin->AddText( aUId.GetText() ); + m_pDbgWin->AddText( Id2Str( aUId ) ); m_pDbgWin->AddText( " Method: " ); m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) ); m_pDbgWin->AddText( "\n" ); #endif - if ( aUId.Matches( UID_ACTIVE ) ) + if ( aUId.equals( UID_ACTIVE ) ) pControl = GetAnyActive(); else { @@ -4618,7 +4552,7 @@ BOOL StatementControl::Execute() if ( pControl && pControl->GetType() == WINDOW_TOOLBOX ) { - if ( !aUId.Matches( pControl->GetSmartUniqueOrHelpId() ) ) + if ( !aUId.equals( pControl->GetUniqueOrHelpId() ) ) { // Also wenn wir irgendwas auf einer Toolbox gefunden haben switch ( nMethodId ) { @@ -4677,7 +4611,7 @@ BOOL StatementControl::Execute() if( pControl ) // Das Fenster Existiert irgendwo, kann aber auch hidden sein! { - nRT = ImpGetRType( pControl, aUId ); // If not Numeric pControl is used + nRT = ImpGetRType( pControl ); #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Type is: " ); m_pDbgWin->AddText( String::CreateFromInt32( nRT ) ); @@ -4820,42 +4754,44 @@ BOOL StatementControl::Execute() } break; case M_GetPage: - pRet->GenReturn ( RET_Value, aUId, ((TabControl*)pControl)->GetTabPage(((TabControl*)pControl)->GetCurPageId())->GetSmartUniqueOrHelpId().GetText()); + pRet->GenReturn ( RET_Value, aUId, Id2Str( ((TabControl*)pControl)->GetTabPage(((TabControl*)pControl)->GetCurPageId())->GetUniqueOrHelpId() ) ); break; case M_SetPage : { // Wegen lokaler Variablen TabControl *pTControl = ((TabControl*)pControl); USHORT nActive = pTControl->GetCurPageId(); USHORT i,anz; - SmartId aID; - SmartId aWantedID; + rtl::OString aID; + rtl::OString aWantedID; + //HELPID BACKWARD (No numbers please (remove PARAM_ULONG_1 part) if ( (nParams & PARAM_ULONG_1) ) { - aWantedID = SmartId( nLNr1 ); + //aWantedID = rtl::OString( nLNr1 ); + ReportError( aUId, GEN_RES_STR1c( S_INTERNAL_ERROR, "using numeric HelpID from old Testtool" ) ); } else if ( (nParams & PARAM_STR_1) ) { - aWantedID = SmartId( aString1 ); + aWantedID = Str2Id( aString1 ); } else ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) ); i = pTControl->GetPagePos( pTControl->GetCurPageId() ); - for ( anz=0 ; anz < pTControl->GetPageCount() && !aID.Matches( aWantedID ) ; anz++ ) + for ( anz=0 ; anz < pTControl->GetPageCount() && !aID.equals( aWantedID ) ; anz++ ) { pTControl->SelectTabPage( pTControl->GetPageId(i) ); /*if (pTControl->GetCurPageId()) pTControl->DeactivatePage(); pTControl->SetCurPageId( pTControl->GetPageId(i) ); pTControl->ActivatePage();*/ - aID = pTControl->GetTabPage(pTControl->GetCurPageId())->GetSmartUniqueOrHelpId(); + aID = pTControl->GetTabPage(pTControl->GetCurPageId())->GetUniqueOrHelpId(); i++; if ( i >= pTControl->GetPageCount() ) i = 0; if ( !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) ) // 3 Mal aufrufen break; } - if ( !aID.Matches( aWantedID ) ) + if ( !aID.equals( aWantedID ) ) { pTControl->SelectTabPage( nActive ); /*if (pTControl->GetCurPageId()) @@ -5291,9 +5227,9 @@ BOOL StatementControl::Execute() ImplMouseButtonUp ( pControl, aMEvnt, FORCE_DIRECT_CALL ); - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; } break; @@ -5305,21 +5241,12 @@ BOOL StatementControl::Execute() case C_ToolBox: { ToolBox *pTB = ((ToolBox*)pControl); - if ( !aUId.Matches( pTB->GetSmartUniqueOrHelpId() ) ) // Also Button auf der ToolBox gefunden + if ( !aUId.equals( pTB->GetUniqueOrHelpId() ) ) // So we found a Button on the ToolBox { if ( (nParams == PARAM_NONE) || (nParams == PARAM_USHORT_1) ) { // Wir fälschen einen Parameter - if ( aUId.HasNumeric() ) - { - nParams |= PARAM_ULONG_1; - nLNr1 = USHORT( aUId.GetNum() ); - DBG_ASSERT( nLNr1 <= 0xFFFF, "ID on ToolBox > 0xFFFF" ); - } - else - { - nParams |= PARAM_STR_1; - aString1 = aUId.GetStr(); - } + nParams |= PARAM_STR_1; + aString1 = Id2Str( aUId ); } else ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) ); @@ -5329,14 +5256,14 @@ BOOL StatementControl::Execute() USHORT nItemPos = 0;\ BOOL bItemFound = FALSE;\ {\ - SmartId aButtonId;\ + rtl::OString aButtonId;\ if( nParams & PARAM_STR_1 )\ - aButtonId = SmartId( aString1 );\ - if( nParams & PARAM_ULONG_1 )\ - aButtonId = SmartId( nLNr1 );\ - for ( nItemPos = 0; nItemPos < pTB->GetItemCount() && !aButtonId.Matches(pTB->GetItemCommand(pTB->GetItemId(nItemPos))) &&\ - !aButtonId.Matches(pTB->GetHelpId(pTB->GetItemId(nItemPos))) ; nItemPos++ ) {}\ - bItemFound = aButtonId.Matches(pTB->GetItemCommand(pTB->GetItemId(nItemPos))) || aButtonId.Matches(pTB->GetHelpId(pTB->GetItemId(nItemPos)));\ + aButtonId = Str2Id( aString1 );\ + else\ + ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) );\ + for ( nItemPos = 0; nItemPos < pTB->GetItemCount() && !aButtonId.equals(Str2Id( pTB->GetItemCommand(pTB->GetItemId(nItemPos)) )) &&\ + !aButtonId.equals(pTB->GetHelpId(pTB->GetItemId(nItemPos))) ; nItemPos++ ) {}\ + bItemFound = aButtonId.equals(Str2Id( pTB->GetItemCommand(pTB->GetItemId(nItemPos)) )) || aButtonId.equals(pTB->GetHelpId(pTB->GetItemId(nItemPos)));\ if ( !bItemFound )\ ReportError( aUId, GEN_RES_STR1( S_HELPID_ON_TOOLBOX_NOT_FOUND, MethodString( nMethodId ) ) );\ else\ @@ -5378,7 +5305,7 @@ BOOL StatementControl::Execute() }\ }\ }\ - }\ + } switch( nMethodId ) { @@ -5398,9 +5325,9 @@ BOOL StatementControl::Execute() MouseEvent aMEvnt(aRect.Center(),1,MOUSE_SIMPLECLICK,MOUSE_LEFT); ImplMouseButtonDown( pTB, aMEvnt );*/ - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; new StatementCommand( this, RC_MenuSelect, PARAM_USHORT_1, pTB->GetItemId(nItemPos) + TOOLBOX_MENUITEM_START ); @@ -5463,9 +5390,9 @@ BOOL StatementControl::Execute() ImplMouseButtonUp( pTB, aMEvnt); // Das Fenster ist offen. - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; } } @@ -5484,24 +5411,26 @@ BOOL StatementControl::Execute() FIND_ITEM; if ( bItemFound ) // FIND_ITEM Erfolgreich { - switch (nNr1) - { - case 0: - pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetHelpId(pTB->GetItemId(nItemPos))); - break; - case 1: - pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemType(nItemPos)); - break; - case 2: - pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemState(pTB->GetItemId(nItemPos))); - break; - case 3: - pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemId(nItemPos)); - break; - default: - pRet->GenReturn ( RET_Value, aUId, comm_ULONG(0)); - break; - } + if ( ValueOK( aUId, CUniString("GetState"), nNr1, 4 ) ) + switch (nNr1) + { + case 0: + pRet->GenReturn ( RET_Value, aUId, Id2Str( pTB->GetHelpId(pTB->GetItemId(nItemPos)) ) ); + break; + case 1: + pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemType(nItemPos)); + break; + case 2: + pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemState(pTB->GetItemId(nItemPos))); + break; + case 3: + pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemId(nItemPos)); + break; + default: + ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) ); + pRet->GenReturn ( RET_Value, aUId, comm_ULONG(0)); + break; + } } } break; @@ -6376,7 +6305,7 @@ protected: break; case M_Close: //aWindowWaitUId = aUId; - DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((DockingWindow*)pControl)->Close(); break; @@ -6452,7 +6381,7 @@ protected: break; } case M_Close: - DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((FloatingWindow*)pControl)->Close(); break; @@ -6475,7 +6404,7 @@ protected: AnimateMouse( pControl, MitteOben); break; case M_Close: - DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((SystemWindow*)pControl)->Close(); break; @@ -6484,7 +6413,7 @@ protected: Window *pChild = GetWinByRT( pControl, WINDOW_OKBUTTON ); if( ControlOK( pChild, "OK Button" ) ) { - DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((Button*)pChild)->Click(); } @@ -6495,7 +6424,7 @@ protected: Window *pChild = GetWinByRT( pControl, WINDOW_CANCELBUTTON ); if( ControlOK( pChild, "Cancel Button" ) ) { - DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((Button*)pChild)->Click(); } @@ -6532,7 +6461,7 @@ protected: AnimateMouse( pControl, MitteOben); break; case M_Close: - DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((WorkWindow*)pControl)->Close(); break; diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx index 1a3efa9df..b0d2f6c4b 100644 --- a/automation/source/server/statemnt.hxx +++ b/automation/source/server/statemnt.hxx @@ -54,7 +54,6 @@ #include <basic/sbstar.hxx> #include <vcl/event.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include <vcl/smartid.hxx> #include <automation/commtypes.hxx> class Window; @@ -241,7 +240,7 @@ public: protected: static Window* SearchClientWin( Window *pBase, Search &aSearch, BOOL MaybeBase = TRUE ); - Window* SearchTree( SmartId aUId, BOOL bSearchButtonOnToolbox = FALSE ); + Window* SearchTree( rtl::OString aUId, BOOL bSearchButtonOnToolbox = FALSE ); Window* GetActive( WindowType nRT, BOOL MaybeBase = TRUE ); Window* GetFocus( WindowType nRT, BOOL MaybeBase = TRUE ); Window* GetAnyActive( BOOL MaybeBase = TRUE ); @@ -253,7 +252,7 @@ protected: Window* GetDocWin( USHORT nNr ); USHORT GetDocWinCount(); Window* GetFadeSplitWin( Window *pBase, WindowAlign nAlign, BOOL MaybeBase = TRUE ); - BOOL ValueOK(SmartId nId, String aBezeichnung, ULONG nValue, ULONG nMax); + BOOL ValueOK(rtl::OString nId, String aBezeichnung, ULONG nValue, ULONG nMax); USHORT GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, Menu *&pMenu ); @@ -274,7 +273,7 @@ public: ***************************************************************************/ void ReportError(String aMessage); - void ReportError(SmartId aUId, String aMessage); + void ReportError(rtl::OString aUId, String aMessage); void ReportError(String aMessage, ULONG nWhatever); static void DirectLog( ULONG nType, String aString ); @@ -285,18 +284,18 @@ public: StatementList *pNext; static StatementList /**pCurrent,*/ *pFirst; static BOOL bReadingCommands; - static SmartId aWindowWaitUId; + static rtl::OString aWindowWaitUId; static Window *pWindowWaitPointer; - static SmartId aWindowWaitOldHelpId; - static SmartId aWindowWaitOldUniqueId; + static rtl::OString aWindowWaitOldHelpId; + static rtl::OString aWindowWaitOldUniqueId; static RetStream *pRet; static BOOL IsError; static BOOL bDying; static BOOL bExecuting; // Gesetzt, wenn ein Befehl rescheduled ohne einen neuen Befehl zu erlauben BOOL bWasExecuting; // Wurde bei einem MaybeResetSafeReschedule resettet, so wird der Zustand danach wiederhergestellt - static SmartId aSubMenuId1; // Untermenüs bei PopupMenus - static SmartId aSubMenuId2; // erstmal 2-Stufig - static SmartId aSubMenuId3; // and now even 3 levels #i31512# + static USHORT aSubMenuId1; // Untermenüs bei PopupMenus + static USHORT aSubMenuId2; // erstmal 2-Stufig + static USHORT aSubMenuId3; // and now even 3 levels #i31512# static SystemWindow *pMenuWindow; // when using MenuBar as base for MenuCommands static TTProperties *pTTProperties; // Hier stehen die SlotIDs aus dem SFX drin @@ -350,7 +349,6 @@ class StatementCommand : public StatementList // Befehl ausführen (wintree, rese friend class ImplRemoteControl; protected: USHORT nMethodId; - SmartId aSmartMethodId; USHORT nParams; comm_USHORT nNr1,nNr2,nNr3,nNr4; comm_ULONG nLNr1; @@ -385,7 +383,7 @@ enum TTHotSpots { MitteLinks, Mitte, MitteOben }; class StatementControl : public StatementList { protected: - SmartId aUId; + rtl::OString aUId; USHORT nMethodId; USHORT nParams; comm_USHORT nNr1,nNr2,nNr3,nNr4; @@ -436,10 +434,10 @@ class SearchUID : public Search { Window *pMaybeResult; Window *pAlternateResult; - SmartId aUId; + rtl::OString aUId; BOOL bSearchButtonOnToolbox; public: - SearchUID( SmartId aUIdP, BOOL bSearchButtonOnToolboxP ): Search( SEARCH_FOCUS_FIRST ), pMaybeResult(NULL), pAlternateResult(NULL), aUId(aUIdP), bSearchButtonOnToolbox(bSearchButtonOnToolboxP) {} + SearchUID( rtl::OString aUIdP, BOOL bSearchButtonOnToolboxP ): Search( SEARCH_FOCUS_FIRST ), pMaybeResult(NULL), pAlternateResult(NULL), aUId(aUIdP), bSearchButtonOnToolbox(bSearchButtonOnToolboxP) {} virtual BOOL IsWinOK( Window *pWin ); Window* GetMaybeWin() { return pMaybeResult; } Window* GetAlternateResultWin() { return pAlternateResult; } diff --git a/automation/source/simplecm/simplecm.cxx b/automation/source/simplecm/simplecm.cxx index 002b0a70c..5a105e723 100644 --- a/automation/source/simplecm/simplecm.cxx +++ b/automation/source/simplecm/simplecm.cxx @@ -136,7 +136,7 @@ void CommunicationLink::SetApplication( const ByteString& aApp ) } -SimpleCommunicationLinkViaSocket::SimpleCommunicationLinkViaSocket( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket ) +SimpleCommunicationLinkViaSocket::SimpleCommunicationLinkViaSocket( CommunicationManager *pMan, vos::OStreamSocket *pSocket ) : CommunicationLink( pMan ) , aCommunicationPartner() , aMyName() @@ -158,7 +158,7 @@ SimpleCommunicationLinkViaSocket::~SimpleCommunicationLinkViaSocket() pStreamSocket = NULL; } -void SimpleCommunicationLinkViaSocket::SetStreamSocket( NAMESPACE_VOS(OStreamSocket)* pSocket ) +void SimpleCommunicationLinkViaSocket::SetStreamSocket( vos::OStreamSocket* pSocket ) { if ( pTCPIO ) pTCPIO->SetStreamSocket( pSocket ); @@ -202,9 +202,9 @@ ByteString SimpleCommunicationLinkViaSocket::GetCommunicationPartner( CM_NameTyp case CM_DOTTED: { rtl::OUString aDotted; - NAMESPACE_VOS(OSocketAddr) *pPeerAdr = new NAMESPACE_VOS(OSocketAddr); + vos::OSocketAddr *pPeerAdr = new vos::OSocketAddr; pStreamSocket->getPeerAddr( *pPeerAdr ); - ((NAMESPACE_VOS(OInetSocketAddr*))pPeerAdr)->getDottedAddr( aDotted ); + ((vos::OInetSocketAddr*)pPeerAdr)->getDottedAddr( aDotted ); delete pPeerAdr; return ByteString( UniString(aDotted), RTL_TEXTENCODING_UTF8 ); } @@ -234,9 +234,9 @@ ByteString SimpleCommunicationLinkViaSocket::GetMyName( CM_NameType eType ) case CM_DOTTED: { rtl::OUString aDotted; - NAMESPACE_VOS(OSocketAddr) *pPeerAdr = new NAMESPACE_VOS(OSocketAddr); + vos::OSocketAddr *pPeerAdr = new vos::OSocketAddr; pStreamSocket->getLocalAddr( *pPeerAdr ); - ((NAMESPACE_VOS(OInetSocketAddr*))pPeerAdr)->getDottedAddr( aDotted ); + ((vos::OInetSocketAddr*)pPeerAdr)->getDottedAddr( aDotted ); delete pPeerAdr; return ByteString( UniString(aDotted), RTL_TEXTENCODING_UTF8 ); } @@ -352,7 +352,7 @@ BOOL SimpleCommunicationLinkViaSocket::SendHandshake( HandshakeType aHandshakeTy return !bWasError; } -SimpleCommunicationLinkViaSocketWithReceiveCallbacks::SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket ) +SimpleCommunicationLinkViaSocketWithReceiveCallbacks::SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, vos::OStreamSocket *pSocket ) : SimpleCommunicationLinkViaSocket( pMan, pSocket ) { } @@ -396,7 +396,7 @@ BOOL SimpleCommunicationLinkViaSocketWithReceiveCallbacks::ShutdownCommunication if ( GetStreamSocket() ) GetStreamSocket()->close(); - NAMESPACE_VOS(OStreamSocket) *pTempSocket = GetStreamSocket(); + vos::OStreamSocket *pTempSocket = GetStreamSocket(); SetStreamSocket( NULL ); delete pTempSocket; @@ -437,7 +437,7 @@ BOOL CommunicationManager::StartCommunication( ByteString aHost, ULONG nPort ) ByteString CommunicationManager::GetMyName( CM_NameType ) { rtl::OUString aHostname; - NAMESPACE_VOS(OSocketAddr)::getLocalHostname( aHostname ); + vos::OSocketAddr::getLocalHostname( aHostname ); return ByteString( UniString(aHostname), RTL_TEXTENCODING_UTF8 ); } @@ -672,8 +672,8 @@ SingleCommunicationManagerClientViaSocket::SingleCommunicationManagerClientViaSo BOOL CommonSocketFunctions::DoStartCommunication( CommunicationManager *pCM, ICommunicationManagerClient *pCMC, ByteString aHost, ULONG nPort ) { - NAMESPACE_VOS(OInetSocketAddr) Addr; - NAMESPACE_VOS(OConnectorSocket) *pConnSocket; + vos::OInetSocketAddr Addr; + vos::OConnectorSocket *pConnSocket; Addr.setAddr( rtl::OUString( UniString( aHost, RTL_TEXTENCODING_UTF8 ) ) ); Addr.setPort( nPort ); @@ -683,9 +683,9 @@ BOOL CommonSocketFunctions::DoStartCommunication( CommunicationManager *pCM, ICo aTV.Nanosec = 0; do { - pConnSocket = new NAMESPACE_VOS(OConnectorSocket)(); + pConnSocket = new vos::OConnectorSocket(); pConnSocket->setTcpNoDelay( 1 ); - if ( pConnSocket->connect( Addr, &aTV ) == NAMESPACE_VOS(ISocketTypes::TResult_Ok) ) + if ( pConnSocket->connect( Addr, &aTV ) == vos::ISocketTypes::TResult_Ok ) { pConnSocket->setTcpNoDelay( 1 ); diff --git a/automation/source/simplecm/tcpio.cxx b/automation/source/simplecm/tcpio.cxx index c37c807cb..7a8d8f674 100644 --- a/automation/source/simplecm/tcpio.cxx +++ b/automation/source/simplecm/tcpio.cxx @@ -63,7 +63,7 @@ comm_USHORT TCPIO::ReceiveBytes( void* pBuffer, comm_UINT32 nLen ) // helper -void TCPIO::SetStreamSocket( NAMESPACE_VOS(OStreamSocket) *pSocket ) +void TCPIO::SetStreamSocket( vos::OStreamSocket *pSocket ) { vos::OGuard aRGuard( aMSocketReadAccess ); vos::OGuard aWGuard( aMSocketWriteAccess ); diff --git a/automation/source/simplecm/tcpio.hxx b/automation/source/simplecm/tcpio.hxx index 9884f3454..d68805455 100644 --- a/automation/source/simplecm/tcpio.hxx +++ b/automation/source/simplecm/tcpio.hxx @@ -36,14 +36,14 @@ class TCPIO : public ITransmiter, public IReceiver { private: - NAMESPACE_VOS(OStreamSocket) *pStreamSocket; + vos::OStreamSocket *pStreamSocket; vos::OMutex aMSocketReadAccess; vos::OMutex aMSocketWriteAccess; public: /// - TCPIO( NAMESPACE_VOS(OStreamSocket) *pSocket ):pStreamSocket( pSocket ){} + TCPIO( vos::OStreamSocket *pSocket ):pStreamSocket( pSocket ){} virtual ~TCPIO(){} @@ -54,7 +54,7 @@ public: virtual comm_USHORT ReceiveBytes( void* pBuffer, comm_UINT32 nLen ); // helper - void SetStreamSocket( NAMESPACE_VOS(OStreamSocket) *pSocket ); + void SetStreamSocket( vos::OStreamSocket *pSocket ); }; diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx index 755ca1fac..6b2f7ac98 100644 --- a/automation/source/testtool/cmdstrm.cxx +++ b/automation/source/testtool/cmdstrm.cxx @@ -98,11 +98,12 @@ String CmdStream::WandleKeyEventString( String aKeys ) { Token = Work.GetToken(0,' '); Work.Erase(0,Token.Len()+1); - ControlDef WhatName(Token,SmartId()); + ControlDef WhatName(Token,rtl::OString()); USHORT nElement; if (pKeyCodes->Seek_Entry(&WhatName,&nElement)) { - USHORT nCode = (USHORT) pKeyCodes->GetObject(nElement)->pData->aUId.GetNum(); + // FIXME: HELPID + USHORT nCode = 0;//(USHORT) pKeyCodes->GetObject(nElement)->pData->aUId.GetNum(); if ( nCode >= KEY_SHIFT ) nModify ^= nCode; else diff --git a/automation/source/testtool/cretstrm.hxx b/automation/source/testtool/cretstrm.hxx index 4f5b3b0d9..4ccd65cbd 100644 --- a/automation/source/testtool/cretstrm.hxx +++ b/automation/source/testtool/cretstrm.hxx @@ -45,7 +45,7 @@ public: void Read ( comm_USHORT &nNr ){CmdBaseStream::Read ( nNr );} void Read ( comm_ULONG &nNr ){CmdBaseStream::Read ( nNr );} // void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars ){CmdBaseStream::Read ( aString, nLenInChars );} - virtual void Read ( SmartId* &pId ){CmdBaseStream::Read ( pId );} + virtual void Read ( rtl::OString* &pId ){CmdBaseStream::Read ( pId );} void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );} // new void Read( String &aString ); diff --git a/automation/source/testtool/httprequest.cxx b/automation/source/testtool/httprequest.cxx index 9061c08f9..b171d81e9 100644 --- a/automation/source/testtool/httprequest.cxx +++ b/automation/source/testtool/httprequest.cxx @@ -78,7 +78,7 @@ BOOL HttpRequest::Execute() Init(); // Open channel to standard redir host - NAMESPACE_VOS(OInetSocketAddr) aConnectAddr; + vos::OInetSocketAddr aConnectAddr; if ( aProxyHost.Len() ) { @@ -95,8 +95,8 @@ BOOL HttpRequest::Execute() aTV.Seconds = 10; // Warte 10 Sekunden aTV.Nanosec = 0; - pOutSocket = new NAMESPACE_VOS(OConnectorSocket)(); - if ( pOutSocket->connect( aConnectAddr, &aTV ) == NAMESPACE_VOS(ISocketTypes::TResult_Ok) ) + pOutSocket = new vos::OConnectorSocket(); + if ( pOutSocket->connect( aConnectAddr, &aTV ) == vos::ISocketTypes::TResult_Ok ) { // pOutSocket->setTcpNoDelay( 1 ); } diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index e2f861438..21b9bac7e 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -137,7 +137,7 @@ CErrors *TestToolObj::pFehlerListe = NULL; // Hier werden die Fehler des Testto DBG_NAME( ControlItem ) DBG_NAME( ControlDef ) -ControlItem::ControlItem( const sal_Char *Name, SmartId aUIdP ) +ControlItem::ControlItem( const sal_Char *Name, rtl::OString aUIdP ) { DBG_CTOR(ControlItem,0); InitData(); @@ -145,7 +145,7 @@ DBG_CTOR(ControlItem,0); pData->aUId = aUIdP; } -ControlItem::ControlItem( const String &Name, SmartId aUIdP ) +ControlItem::ControlItem( const String &Name, rtl::OString aUIdP ) { DBG_CTOR(ControlItem,0); InitData(); @@ -196,7 +196,7 @@ ControlSon::~ControlSon() } } -ControlItemSon::ControlItemSon(const String &Name, SmartId aUIdP ) +ControlItemSon::ControlItemSon(const String &Name, rtl::OString aUIdP ) : ControlItem( Name, aUIdP ) {} @@ -226,6 +226,8 @@ BOOL ControlDef::operator == (const ControlItem &rPar) void ControlDef::Write( SvStream &aStream ) { + // FIXME: HELPID + #if 0 if ( pSons ) aStream.WriteByteString( String('*').Append( pData->Kurzname ), RTL_TEXTENCODING_UTF8 ); else @@ -238,9 +240,12 @@ void ControlDef::Write( SvStream &aStream ) if ( pSons ) for ( USHORT i = 0 ; pSons->Count() > i ; i++ ) ((ControlDef*)(*pSons)[i])->Write(aStream); + #else + (void)aStream; + #endif } -ControlDef::ControlDef(const String &Name, SmartId aUIdP ) +ControlDef::ControlDef(const String &Name, rtl::OString aUIdP ) : ControlItemSon( Name, aUIdP) { DBG_CTOR(ControlDef,0); @@ -292,7 +297,7 @@ BOOL ControlItemUId::operator == (const ControlItem &rPar) SV_IMPL_OP_PTRARR_SORT( CNames, ControlItem* ) -void CRevNames::Insert( String aName, SmartId aUId, ULONG nSeq ) +void CRevNames::Insert( String aName, rtl::OString aUId, ULONG nSeq ) { ControlItem *pRN = new ReverseName(aName,aUId,nSeq); USHORT nPos; @@ -307,7 +312,7 @@ void CRevNames::Insert( String aName, SmartId aUId, ULONG nSeq ) } -String CRevNames::GetName( SmartId aUId ) +String CRevNames::GetName( rtl::OString aUId ) { ReverseName *pRN = new ReverseName(UniString(),aUId,0); USHORT nPos; @@ -318,10 +323,15 @@ String CRevNames::GetName( SmartId aUId ) return GetObject(nPos)->pData->Kurzname; else { + // FIXME: HELPID + #if 0 if ( aUId.Matches( UID_ACTIVE ) ) return CUniString("Active"); else return GEN_RES_STR1( S_NAME_NOT_THERE, aUId.GetText() ); + #else + return String(); + #endif } } @@ -686,7 +696,12 @@ void TestToolObj::InitTestToolObj() SbxTransportMethod *pMeth = new SbxTransportMethod( SbxVARIANT ); pMeth->SetName( pRCommands->GetObject( i )->pData->Kurzname ); pMeth->SetUserData( ID_RemoteCommand ); + // FIXME: HELPID + #if 0 pMeth->nValue = pRCommands->GetObject( i )->pData->aUId.GetNum(); + #else + pMeth->nValue = 0; + #endif Insert( pMeth ); StartListening( pMeth->GetBroadcaster(), TRUE ); } @@ -866,7 +881,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B SvFileStream Stream; String aLine,aShortname,aLongname; - SmartId aUId; + rtl::OString aUId; xub_StrLen nLineNr; USHORT nElement; ControlDef *pNewDef, *pNewDef2; @@ -884,7 +899,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B ReadFlat( aFileName ,pUIds, TRUE ); if ( !pUIds ) return; - pNewDef = new ControlDef("Active",SmartId(0)); + pNewDef = new ControlDef("Active",rtl::OString()); const ControlItem *pItem = pNewDef; if (! pUIds->Insert(pItem)) { @@ -986,7 +1001,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B if ( aShortname.GetChar(0) == '+' ) // Kompletten Eintrag kopieren { aShortname.Erase(0,1); - ControlDef WhatName(aLongname,SmartId()); + ControlDef WhatName(aLongname,rtl::OString()); ControlDef *OldTree; if (pNames->Seek_Entry(&WhatName,&nElement)) { @@ -1015,11 +1030,15 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B else { + // FIXME: HELPID + #if 0 if (aShortname.CompareIgnoreCaseToAscii("*Active") == COMPARE_EQUAL) - aUId = SmartId( UID_ACTIVE ); - else if ( !bUnoName && !bMozillaName ) + aUId = rtl::OString( UID_ACTIVE ); + else + #endif + if ( !bUnoName && !bMozillaName ) { // Bestimmen der ID aus der Hid.Lst - ControlDef WhatName(aLongname,SmartId()); + ControlDef WhatName(aLongname,rtl::OString()); if (pUIds->Seek_Entry(&WhatName,&nElement)) aUId = pUIds->GetObject(nElement)->pData->aUId; else @@ -1030,14 +1049,17 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B } else { + // FIXME: HELPID + #if 0 if ( bUnoName ) - aUId = SmartId( aLongname ); + aUId = rtl::OString( aLongname ); else if ( bMozillaName ) - aUId = SmartId( aLongname ); + aUId = rtl::OString( aLongname ); else { DBG_ERROR("Unknown URL schema"); } + #endif } @@ -1121,7 +1143,7 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName ) { SvFileStream Stream; String aLine,aLongname; - SmartId aUId; + rtl::OString aUId; xub_StrLen nLineNr; ControlItem *pNewItem; USHORT nDoubleCount = 0; @@ -1162,7 +1184,8 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName ) } aLongname = aLine.GetToken(0,cMyDelim); - aUId = SmartId( (ULONG)aLine.GetToken(1,cMyDelim).ToInt64() ); + // FIXME: HELPID + aUId = rtl::OUStringToOString( aLine.GetToken(1,cMyDelim), RTL_TEXTENCODING_UTF8 ); if ( bSortByName ) pNewItem = new ControlDef( aLongname, aUId ); @@ -1211,7 +1234,8 @@ void ReadFlatArray( const ControlDefLoad arWas [], CNames *&pNames ) while ( String::CreateFromAscii(arWas[nIndex].Kurzname).Len() > 0 ) { - SmartId aUId (arWas[nIndex].nUId); + // FIXME: HELPID + rtl::OString aUId;// (arWas[nIndex].nUId); const ControlItem *pX = new ControlDef( arWas[nIndex].Kurzname, aUId); pNames->C40_PTR_INSERT(ControlItem, pX); nIndex++; @@ -1472,7 +1496,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr { SvFileStream aStream; String aName,aURL; - SmartId aUId; + rtl::OString aUId; ControlDef *pNewDef, *pNewDef2; ControlDef *pFatherDef = NULL; @@ -1510,13 +1534,16 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr { String aStrId; aStream.ReadByteString( aStrId, RTL_TEXTENCODING_UTF8 ); - aUId = SmartId( aStrId ); + // FIXME: HELPID + #if 0 + aUId = rtl::OString( aStrId ); + #endif } else { comm_ULONG nUId; aStream >> nUId; - aUId = SmartId( nUId ); + aUId = rtl::OString();// nUId; } if (aName.GetChar(0) == '*' || bIsFlat ) // Globaler Kurzname (Dialogname oder SId) @@ -1661,7 +1688,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, USHORT nElement; SbxVariableRef pArg = rPar->Get( 1 ); String aKontext = pArg->GetString(); - ControlDef WhatName(aKontext,SmartId()); + ControlDef WhatName(aKontext,rtl::OString()); if (m_pControls && m_pControls->Seek_Entry(&WhatName,&nElement)) { m_pNameKontext = ((ControlDef*)m_pControls->GetObject(nElement))->GetSons(); @@ -2154,7 +2181,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, ((Controls*)pVar)->PutULong( ((Controls*)pVar)->pMethodVar->GetULong() ); ((Controls*)pVar)->pMethodVar->SetUserData(ID_Control); - pShortNames->Insert( CUniString("xxx"), SmartId( ((Controls*)pVar)->pMethodVar->nValue ), nSequence ); + pShortNames->Insert( CUniString("xxx"), rtl::OString( ((Controls*)pVar)->pMethodVar->nValue ), nSequence ); nOldValue = ((Controls*)pVar)->GetULong(); @@ -2193,7 +2220,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, if ( !IsError() && ((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN ) { pImpl->pNextReturn = ((SbxTransportMethod*)pVar); - aNextReturnId = SmartId( ((SbxTransportMethod*)pVar)->nValue ); + // FIXME: HELPID + aNextReturnId = rtl::OString();// ((SbxTransportMethod*)pVar)->nValue ); } if ( SingleCommandBlock ) EndBlock(); @@ -2266,13 +2294,17 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, { In->GenCmdControl (pMember->GetULong(), (USHORT)((SbxTransportMethod*)pVar)->nValue, rPar); - aNextReturnId = SmartId( pMember->GetULong() ); + // FIXME: HELPID + aNextReturnId = rtl::OString();// pMember->GetULong() ); } else { In->GenCmdControl (pMember->GetString(), (USHORT)((SbxTransportMethod*)pVar)->nValue, rPar); - aNextReturnId = SmartId( pMember->GetString() ); + // FIXME: HELPID + #if 0 + aNextReturnId = rtl::OString( pMember->GetString() ); + #endif } } @@ -2283,7 +2315,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, else { pImpl->pNextReturn = NULL; - aNextReturnId = SmartId(); + aNextReturnId = rtl::OString(); } } @@ -2839,7 +2871,7 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType) { USHORT nElement; - ControlDef *pWhatName = new ControlDef(aStr,SmartId()); + ControlDef *pWhatName = new ControlDef(aStr,rtl::OString()); /// nach Controls suchen if (m_pNameKontext && m_pNameKontext->Seek_Entry(pWhatName,&nElement)) @@ -2854,9 +2886,12 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType) // Will be set on method-child further down + // FIXME: HELPID + #if 0 if ( pWhatName->pData->aUId.HasNumeric() ) pImpl->pControlsObj->SetUserData( ID_Control ); else + #endif pImpl->pControlsObj->SetUserData( ID_StringControl ); pShortNames->Insert(pWhatName->pData->Kurzname,pWhatName->pData->aUId,nSequence); @@ -2869,10 +2904,13 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType) pImpl->pControlsObj->SetDfltProperty(pID); pMember = pID; } + // FIXME: HELPID + #if 0 if ( pWhatName->pData->aUId.HasNumeric() ) pMember->PutULong(pWhatName->pData->aUId.GetNum()); else pMember->PutString(pWhatName->pData->aUId.GetStr()); + #endif pMember = pImpl->pControlsObj->Find(CUniString("name"),SbxCLASS_DONTCARE); if ( pMember != NULL ) @@ -2892,6 +2930,8 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType) pWhatName = ( (ControlDef*)m_pSIds->GetObject( nElement ) ); pMyVar->SetName( pWhatName->pData->Kurzname ); + // FIXME: HELPID + #if 0 if ( pWhatName->pData->aUId.HasNumeric() ) { pMyVar->SetUserData( ID_Dispatch ); @@ -2903,6 +2943,7 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType) pMyVar->SetUserData( ID_UNODispatch ); pMyVar->aUnoSlot = pWhatName->pData->aUId.GetStr(); } + #endif return pMyVar; } @@ -2910,7 +2951,7 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType) if ( aStr.Copy( aStr.Len()-3, 3 ).CompareIgnoreCaseToAscii("_ID") == COMPARE_EQUAL && m_pSIds ) { delete pWhatName; - pWhatName = new ControlDef( aStr.Copy( 0, aStr.Len()-3 ), SmartId() ); + pWhatName = new ControlDef( aStr.Copy( 0, aStr.Len()-3 ), rtl::OString() ); if ( m_pSIds->Seek_Entry( pWhatName, &nElement ) ) { // Nach slots suchen SbxVariable *pReturn = new SbxVariable; @@ -2918,10 +2959,13 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType) pWhatName = ( (ControlDef*)m_pSIds->GetObject( nElement ) ); pReturn->SetName( pWhatName->pData->Kurzname ); + // FIXME: HELPID + #if 0 if ( pWhatName->pData->aUId.HasNumeric() ) pReturn->PutULong(pWhatName->pData->aUId.GetNum()); else pReturn->PutString(pWhatName->pData->aUId.GetStr()); + #endif return pReturn; } } @@ -3320,7 +3364,8 @@ void TestToolObj::SortControlsByNumber( BOOL bIncludeActive ) } if ( !bIncludeActive ) { - ControlItem *pZeroItem = new ControlItemUId( UniString(), SmartId(0) ); + // FIXME: HELPID + ControlItem *pZeroItem = new ControlItemUId( UniString(), rtl::OString() ); USHORT nNr; if ( m_pReverseControls->Seek_Entry( pZeroItem, &nNr ) ) { @@ -3356,19 +3401,25 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) case SIReturn: { USHORT nRet,nParams; - SmartId aUId; + rtl::OString aUId; pRetStream->Read(nRet); if ( pRetStream->GetNextType() == BinString ) { String aUStrId; // UniqueStringID Used for Mozilla Integration pRetStream->Read( aUStrId ); - aUId = SmartId( aUStrId ); + // FIXME: HELPID + #if 0 + aUId = rtl::OString( aUStrId ); + #endif } else { comm_ULONG nUId; pRetStream->Read( nUId ); // bei Sequence einfach die Sequence - aUId = SmartId( nUId ); + // FIXME: HELPID + #if 0 + aUId = rtl::OString( nUId ); + #endif } pRetStream->Read(nParams); @@ -3397,6 +3448,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { case RET_Sequence: { + // FIXME: HELPID + #if 0 ULONG nUId = aUId.GetNum(); if ( nSequence != nUId ) { @@ -3407,6 +3460,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { nClearSequence = nUId; } + #endif } break; case RET_Value: @@ -3415,9 +3469,9 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) // ULONG nHintUserData = pImpl->pNextReturn->GetParent()->GetUserData(); // pImpl->pNextReturn->GetParent()->SetUserData(0); // if ( nUId == pImpl->pNextReturn->GetParent()->GetULong() ) - if ( aNextReturnId.Matches( aUId ) ) + if ( aNextReturnId.equals( aUId ) ) { - if( nParams & PARAM_ULONG_1 ) + if( nParams & PARAM_ULONG_1 ) // FIXME this is to allow negative numbers, hoping that no large numbers are interpreted wrong. should have new PARAM_LONG_1 instead { if ( nLNr1 > 0x7fffffff ) pImpl->pNextReturn->PutLong( long(nLNr1 - 0xffffffff) -1 ); @@ -3427,7 +3481,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) if( nParams & PARAM_USHORT_1 ) pImpl->pNextReturn->PutUShort( nNr1 ); if( nParams & PARAM_STR_1 ) pImpl->pNextReturn->PutString( aString1 ); if( nParams & PARAM_BOOL_1 ) pImpl->pNextReturn->PutBool( bBool1 ); - if( nParams & PARAM_SBXVALUE_1 ) + if( nParams & PARAM_SBXVALUE_1 ) // FIXME: allow generic datatype { SbxValues aValues( SbxDATE ); xValue1->Get( aValues ); @@ -3468,7 +3522,10 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) } WinInfoRec *pWinInfo = new WinInfoRec; + // FIXME: HELPID + #if 0 pWinInfo->aUId = aUId.GetText(); + #endif pWinInfo->nRType = (USHORT)nLNr1; // just ULONG for Transport, data is always USHORT pWinInfo->aRName = aString1; pWinInfo->bIsReset = bBool1; @@ -3504,7 +3561,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) ControlItem *pNewItem = new ControlItemUId( String(), aUId ); if ( pReverseControlsKontext->Seek_Entry(pNewItem,&nNr) ) { -// SmartId aID = pReverseControlsKontext->GetObject(nNr)->pData->aUId; +// rtl::OString aID = pReverseControlsKontext->GetObject(nNr)->pData->aUId; pWinInfo->aKurzname += pReverseControlsKontext->GetObject(nNr)->pData->Kurzname; } delete pNewItem; @@ -3521,6 +3578,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) } // Langname feststellen + // FIXME: HELPID + #if 0 if ( aUId.HasString() ) { // use the String ID since there is no LongName in hid.lst pWinInfo->aLangname = aUId.GetStr(); @@ -3536,6 +3595,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) delete pNewItem; } } + #endif aWinInfoHdl.Call( pWinInfo ); @@ -3544,6 +3604,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) break; case RET_ProfileInfo: { + // FIXME: HELPID + #if 0 ULONG nUId = aUId.GetNum(); if ( nParams & PARAM_STR_1 ) { @@ -3672,10 +3734,13 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) break; } } + #endif } break; case RET_DirectLoging: { + // FIXME: HELPID + #if 0 ULONG nUId = aUId.GetNum(); switch ( nUId ) { @@ -3694,6 +3759,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) default: ; } + #endif } break; case RET_MacroRecorder: @@ -3724,7 +3790,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) if ( m_pReverseControls ) { USHORT nNr; - ControlItem *pNewItem = new ControlItemUId( String(), SmartId( nLNr1 ) ); + // FIXME: HELPID + ControlItem *pNewItem = new ControlItemUId( String(), rtl::OString( /*nLNr1*/ ) ); if ( m_pReverseControls->Seek_Entry(pNewItem,&nNr) ) aULongNames = m_pReverseControls->GetObject(nNr)->pData->Kurzname; delete pNewItem; @@ -3959,18 +4026,24 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) case SIReturnError: { String aString; - SmartId aUId; + rtl::OString aUId; if ( pRetStream->GetNextType() == BinString ) { String aUStrId; // UniqueStringID Used for Mozilla Integration pRetStream->Read( aUStrId ); - aUId = SmartId( aUStrId ); + // FIXME: HELPID + #if 0 + aUId = rtl::OString( aUStrId ); + #endif } else { comm_ULONG nUId; pRetStream->Read( nUId ); // bei Sequence einfach die Sequence - aUId = SmartId( nUId ); + // FIXME: HELPID + #if 0 + aUId = rtl::OString( nUId ); + #endif } pRetStream->Read( aString ); ReplaceNumbers (aString); @@ -4016,9 +4089,15 @@ String TestToolObj::GetMethodName( ULONG nMethodId ) ReadFlatArray( Controls::arClasses, Controls::pClasses ); if ( Controls::pClasses ) { + // FIXME: HELPID + #if 0 for ( nElement = 0 ; nElement < Controls::pClasses->Count() ; nElement++ ) if ( Controls::pClasses->GetObject(nElement)->pData->aUId.Matches( nMethodId ) ) return Controls::pClasses->GetObject(nElement)->pData->Kurzname; + #else + (void)nElement; + (void)nMethodId; + #endif } return String(); } @@ -4030,9 +4109,15 @@ String TestToolObj::GetKeyName( USHORT nKeyCode ) ReadFlatArray( CmdStream::arKeyCodes, CmdStream::pKeyCodes ); if ( CmdStream::pKeyCodes ) { + // FIXME: HELPID + #if 0 for ( nElement = 0 ; nElement < CmdStream::pKeyCodes->Count() ; nElement++ ) if ( CmdStream::pKeyCodes->GetObject(nElement)->pData->aUId.Matches( nKeyCode ) ) return CmdStream::pKeyCodes->GetObject(nElement)->pData->Kurzname; + #else + (void)nElement; + (void)nKeyCode; + #endif } return CUniString( "UnknownKeyCode" ); } @@ -4061,7 +4146,8 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = bFound = FALSE; if ( aType.CompareTo(UIdKenn) == COMPARE_EQUAL ) { - aResult = pShortNames->GetName(SmartId(nNumber)); + // FIXME: HELPID + aResult = pShortNames->GetName(rtl::OString(/*nNumber*/)); bFound = TRUE; } if ( aType.CompareTo(MethodKenn ) == COMPARE_EQUAL ) @@ -4078,12 +4164,17 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = USHORT nElement; if ( pRCommands ) { + // FIXME: HELPID + #if 0 for ( nElement = 0 ; nElement < pRCommands->Count() ; nElement++ ) if ( pRCommands->GetObject(nElement)->pData->aUId.Matches( nNumber ) ) { aResult = pRCommands->GetObject(nElement)->pData->Kurzname; nElement = pRCommands->Count(); } + #else + (void)nElement; + #endif } } if ( aType.CompareTo(TypeKenn ) == COMPARE_EQUAL ) @@ -4095,17 +4186,23 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = USHORT nElement; if ( pRTypes ) { + // FIXME: HELPID + #if 0 for ( nElement = 0 ; nElement < pRTypes->Count() ; nElement++ ) if ( pRTypes->GetObject(nElement)->pData->aUId.Matches( nNumber ) ) { aResult = pRTypes->GetObject(nElement)->pData->Kurzname; nElement = pRTypes->Count(); } + #else + (void)nElement; + #endif } } if ( aType.CompareTo(SlotKenn ) == COMPARE_EQUAL ) { - aResult = pShortNames->GetName(SmartId(nNumber)); + // FIXME: HELPID + aResult = pShortNames->GetName(rtl::OString(/*nNumber*/)); bFound = TRUE; } if ( aType.CompareTo(TabKenn ) == COMPARE_EQUAL ) @@ -4142,7 +4239,7 @@ SbTextType TestToolObj::GetSymbolType( const String &rSymbol, BOOL bWasControl ) } - ControlDef WhatName( rSymbol, SmartId() ); + ControlDef WhatName( rSymbol, rtl::OString() ); if ( bWasControl ) { @@ -4233,11 +4330,12 @@ SbxVariable* Controls::Find( const String& aStr, SbxClassType aType) USHORT nElement; - ControlDef WhatName(aStr,SmartId()); + ControlDef WhatName(aStr,rtl::OString()); if (pClasses && pClasses->Seek_Entry(&WhatName,&nElement)) { pMethodVar->SetName(aStr); - ULONG nUId = pClasses->GetObject(nElement)->pData->aUId.GetNum(); + // FIXME: HELPID + ULONG nUId = 0;//pClasses->GetObject(nElement)->pData->aUId.GetNum(); pMethodVar->nValue = nUId; pMethodVar->SetUserData( GetUserData() ); diff --git a/automation/source/testtool/objtest.hxx b/automation/source/testtool/objtest.hxx index e9c46d257..1429d506d 100644 --- a/automation/source/testtool/objtest.hxx +++ b/automation/source/testtool/objtest.hxx @@ -35,7 +35,6 @@ #include <testtool.hxx> #include "cmdstrm.hxx" #include <basic/basicrt.hxx> -#include <vcl/smartid.hxx> #include "httprequest.hxx" #include <map> @@ -106,7 +105,7 @@ class ControlData { public: String Kurzname; - SmartId aUId; + rtl::OString aUId; }; DBG_NAMEEX( ControlItem ) @@ -118,8 +117,8 @@ private: public: ControlData *pData; - ControlItem( const char *Name, SmartId aUIdP ); - ControlItem( const String &Name, SmartId aUIdP ); + ControlItem( const char *Name, rtl::OString aUIdP ); + ControlItem( const String &Name, rtl::OString aUIdP ); // ControlItem( const String &Name, const String &URL, const URLType aType ); // ControlItem( const String &Name, const String &URL, const ULONG nUId ); // ControlItem( const char *Name, const String &URL, const ULONG nUId ); @@ -158,9 +157,9 @@ public: class ControlItemSon : public ControlItem, public ControlSon { public: - ControlItemSon(const char *Name, SmartId aUIdP ) + ControlItemSon(const char *Name, rtl::OString aUIdP ) : ControlItem( Name, aUIdP ) {} - ControlItemSon(const String &Name, SmartId aUIdP ); + ControlItemSon(const String &Name, rtl::OString aUIdP ); // ControlItemSon(const String &Name, const String &URL, const URLType aType ); // ControlItemSon(const String &Name, const String &URL, const ULONG nUId ); // ControlItemSon(const char *Name, const String &URL, const ULONG nUId ); @@ -170,9 +169,9 @@ public: class ControlDef : public ControlItemSon { public: - ControlDef(const char *Name, SmartId aUIdP ) + ControlDef(const char *Name, rtl::OString aUIdP ) : ControlItemSon( Name, aUIdP ) {DBG_CTOR(ControlDef,0);} - ControlDef(const String &Name, SmartId aUIdP ); + ControlDef(const String &Name, rtl::OString aUIdP ); // ControlDef(const String &Name, const String &URL, const URLType aType ); ControlDef(const String &aOldName, const String &aNewName, ControlDef *pOriginal, BOOL bWithSons = FALSE ); ~ControlDef() {DBG_DTOR(ControlDef,0);} @@ -185,7 +184,7 @@ public: class ControlItemUId : public ControlItem { public: - ControlItemUId(String Name, SmartId aUIdP) + ControlItemUId(String Name, rtl::OString aUIdP) : ControlItem( Name, aUIdP){} virtual BOOL operator < (const ControlItem &rPar); virtual BOOL operator == (const ControlItem &rPar); @@ -194,7 +193,7 @@ public: class ControlItemUIdSon : public ControlItemUId, public ControlSon { public: - ControlItemUIdSon(String Name, SmartId aUIdP) : ControlItemUId( Name, aUIdP) {} + ControlItemUIdSon(String Name, rtl::OString aUIdP) : ControlItemUId( Name, aUIdP) {} MK_SON_ACCESS( ControlItemUId ) }; @@ -203,14 +202,14 @@ class ReverseName : public ControlItemUId public: ULONG LastSequence; - ReverseName(String Name, SmartId aUIdP, ULONG nSeq) : ControlItemUId( Name, aUIdP), LastSequence(nSeq) {} + ReverseName(String Name, rtl::OString aUIdP, ULONG nSeq) : ControlItemUId( Name, aUIdP), LastSequence(nSeq) {} }; class CRevNames: public CNames { public: - void Insert( String aName, SmartId aUId, ULONG nSeq ); - String GetName( SmartId aUId ); + void Insert( String aName, rtl::OString aUId, ULONG nSeq ); + String GetName( rtl::OString aUId ); void Invalidate ( ULONG nSeq ); }; diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc index be1f441e2..64341f504 100644 --- a/basctl/inc/helpid.hrc +++ b/basctl/inc/helpid.hrc @@ -27,59 +27,53 @@ #ifndef _BASCTL_HELPID_HRC #define _BASCTL_HELPID_HRC -// include --------------------------------------------------------------- +#define HID_BASICIDE_TOOLBOX "BASCTL_HID_BASICIDE_TOOLBOX" +#define HID_BASICIDE_OBJECTS "BASCTL_HID_BASICIDE_OBJECTS" +#define HID_MACRO_OPTIONS "BASCTL_HID_MACRO_OPTIONS" +#define HID_BASICIDE_BRKPNTS "BASCTL_HID_BASICIDE_BRKPNTS" +#define HID_BASICIDE_MODULS "BASCTL_HID_BASICIDE_MODULS" +#define HID_BASICIDE_LIBS_TP "BASCTL_HID_BASICIDE_LIBS_TP" +#define HID_BASICIDE_LIBS_DLG "BASCTL_HID_BASICIDE_LIBS_DLG" +#define HID_BASICIDE_CONTROLS "BASCTL_HID_BASICIDE_CONTROLS" +#define HID_BASICIDE_MACROS "BASCTL_HID_BASICIDE_MACROS" +#define HID_BASICIDE_LIBS "BASCTL_HID_BASICIDE_LIBS" +#define HID_BASICIDE_ORG_TC "BASCTL_HID_BASICIDE_ORG_TC" -#include <svl/solar.hrc> +#define HID_BASICIDE_MODULES_TREE "BASCTL_HID_BASICIDE_MODULES_TREE" +#define HID_BASICIDE_LIBS_TREE "BASCTL_HID_BASICIDE_LIBS_TREE" +#define HID_BASICIDE_LIBSDLG_TREE "BASCTL_HID_BASICIDE_LIBSDLG_TREE" +#define HID_BASICIDE_OBJECTCAT "BASCTL_HID_BASICIDE_OBJECTCAT" -// Help-Ids -------------------------------------------------------------- +#define HID_BASICIDE_PROP_BROWSER "BASCTL_HID_BASICIDE_PROP_BROWSER" -#define HID_BASICIDE_TOOLBOX (HID_BASICIDE_START + 0) -#define HID_BASICIDE_OBJECTS (HID_BASICIDE_START + 1) -#define HID_MACRO_OPTIONS (HID_BASICIDE_START + 2) -#define HID_BASICIDE_BRKPNTS (HID_BASICIDE_START + 3) -#define HID_BASICIDE_MODULS (HID_BASICIDE_START + 4) -#define HID_BASICIDE_LIBS_TP (HID_BASICIDE_START + 5) -#define HID_BASICIDE_LIBS_DLG (HID_BASICIDE_START + 6) -#define HID_BASICIDE_CONTROLS (HID_BASICIDE_START + 7) -#define HID_BASICIDE_MACROS (HID_BASICIDE_START + 8) -#define HID_BASICIDE_LIBS (HID_BASICIDE_START + 9) -#define HID_BASICIDE_ORG_TC (HID_BASICIDE_START + 10) +#define HID_BASICIDE_PROP_BROWSER_LBOX "BASCTL_HID_BASICIDE_PROP_BROWSER_LBOX" -#define HID_BASICIDE_MODULES_TREE (HID_BASICIDE_START + 11) -#define HID_BASICIDE_LIBS_TREE (HID_BASICIDE_START + 12) -#define HID_BASICIDE_LIBSDLG_TREE (HID_BASICIDE_START + 13) -#define HID_BASICIDE_OBJECTCAT (HID_BASICIDE_START + 14) +#define HID_BASICIDE_OBJCAT_SHOW "BASCTL_HID_BASICIDE_OBJCAT_SHOW" +#define HID_BASICIDE_OBJCAT_PROPS "BASCTL_HID_BASICIDE_OBJCAT_PROPS" +#define HID_BASICIDE_OBJCAT_HELP "BASCTL_HID_BASICIDE_OBJCAT_HELP" -#define HID_BASICIDE_PROP_BROWSER (HID_BASICIDE_START + 15) +#define HID_BASICIDE_BRKDLG "BASCTL_HID_BASICIDE_BRKDLG" +#define HID_BASICIDE_ACTIV "BASCTL_HID_BASICIDE_ACTIV" +#define HID_BASICIDE_BRKPROPS "BASCTL_HID_BASICIDE_BRKPROPS" +#define HID_BASICIDE_REMOVEWATCH "BASCTL_HID_BASICIDE_REMOVEWATCH" +#define HID_BASICIDE_GOTOALL "BASCTL_HID_BASICIDE_GOTOALL" -#define HID_BASICIDE_PROP_BROWSER_LBOX (HID_BASICIDE_START + 16) +#define HID_BASICIDE_MODULWINDOW "BASCTL_HID_BASICIDE_MODULWINDOW" +#define HID_BASICIDE_DIALOGWINDOW "BASCTL_HID_BASICIDE_DIALOGWINDOW" -#define HID_BASICIDE_OBJCAT_SHOW (HID_BASICIDE_START + 17) -#define HID_BASICIDE_OBJCAT_PROPS (HID_BASICIDE_START + 18) -#define HID_BASICIDE_OBJCAT_HELP (HID_BASICIDE_START + 19) +#define HID_BASICIDE_EDITORWINDOW "BASCTL_HID_BASICIDE_EDITORWINDOW" +#define HID_BASICIDE_BREAKPOINTWINDOW "BASCTL_HID_BASICIDE_BREAKPOINTWINDOW" +#define HID_BASICIDE_WATCHWINDOW "BASCTL_HID_BASICIDE_WATCHWINDOW" +#define HID_BASICIDE_STACKWINDOW "BASCTL_HID_BASICIDE_STACKWINDOW" +#define HID_BASICIDE_TABBAR "BASCTL_HID_BASICIDE_TABBAR" +#define HID_BASICIDE_WATCHWINDOW_EDIT "BASCTL_HID_BASICIDE_WATCHWINDOW_EDIT" +#define HID_BASICIDE_WATCHWINDOW_LIST "BASCTL_HID_BASICIDE_WATCHWINDOW_LIST" +#define HID_BASICIDE_STACKWINDOW_LIST "BASCTL_HID_BASICIDE_STACKWINDOW_LIST" -#define HID_BASICIDE_BRKDLG (HID_BASICIDE_START + 20) -#define HID_BASICIDE_ACTIV (HID_BASICIDE_START + 21) -#define HID_BASICIDE_BRKPROPS (HID_BASICIDE_START + 22) -#define HID_BASICIDE_REMOVEWATCH (HID_BASICIDE_START + 23) -#define HID_BASICIDE_GOTOALL (HID_BASICIDE_START + 24) - -#define HID_BASICIDE_MODULWINDOW (HID_BASICIDE_START + 25) -#define HID_BASICIDE_DIALOGWINDOW (HID_BASICIDE_START + 26) - -#define HID_BASICIDE_EDITORWINDOW (HID_BASICIDE_START + 27) -#define HID_BASICIDE_BREAKPOINTWINDOW (HID_BASICIDE_START + 28) -#define HID_BASICIDE_WATCHWINDOW (HID_BASICIDE_START + 29) -#define HID_BASICIDE_STACKWINDOW (HID_BASICIDE_START + 30) -#define HID_BASICIDE_TABBAR (HID_BASICIDE_START + 31) -#define HID_BASICIDE_WATCHWINDOW_EDIT (HID_BASICIDE_START + 32) -#define HID_BASICIDE_WATCHWINDOW_LIST (HID_BASICIDE_START + 33) -#define HID_BASICIDE_STACKWINDOW_LIST (HID_BASICIDE_START + 34) - -#define HID_BASICIDE_MANAGE_LANGUAGE (HID_BASICIDE_START + 35) -#define HID_BASICIDE_SETDEFAULT_LANGUAGE (HID_BASICIDE_START + 36) -#define HID_BASICIDE_ADDNEW_LANGUAGE (HID_BASICIDE_START + 37) -#define HID_BASICIDE_ADDNEW_CONTROL (HID_BASICIDE_START + 38) +#define HID_BASICIDE_MANAGE_LANGUAGE "BASCTL_HID_BASICIDE_MANAGE_LANGUAGE" +#define HID_BASICIDE_SETDEFAULT_LANGUAGE "BASCTL_HID_BASICIDE_SETDEFAULT_LANGUAGE" +#define HID_BASICIDE_ADDNEW_LANGUAGE "BASCTL_HID_BASICIDE_ADDNEW_LANGUAGE" +#define HID_BASICIDE_ADDNEW_CONTROL "BASCTL_HID_BASICIDE_ADDNEW_CONTROL" #endif diff --git a/basctl/prj/d.lst b/basctl/prj/d.lst index d05ff35bd..b3ded50b6 100644 --- a/basctl/prj/d.lst +++ b/basctl/prj/d.lst @@ -21,3 +21,4 @@ mkdir: %_DEST%\inc%_EXT%\basctl ..\uiconfig\basicide\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\menubar\*.xml ..\uiconfig\basicide\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\toolbar\*.xml ..\uiconfig\basicide\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\statusbar\*.xml +..\%__SRC%\misc\basctl.component %_DEST%\xml%_EXT%\basctl.component diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index c1041f9b0..5fd7c4139 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -88,42 +88,6 @@ void BasicDocShell::SetPrinter( SfxPrinter* pPr ) } } -void BasicDocShell::FillStatusBar( StatusBar& rStatusBar ) -{ - String aTmp; - - // Titel - aTmp.Fill( 30, 'X' ); - rStatusBar.InsertItem( SID_BASICIDE_STAT_TITLE, - rStatusBar.GetTextWidth( aTmp ), SIB_AUTOSIZE | SIB_LEFT); - - // Modify - rStatusBar.InsertItem( SID_DOC_MODIFIED, - rStatusBar.GetTextWidth( '*' ) ); - - // signatures - rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW ); - rStatusBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE); - - // Position - aTmp.Erase(); - aTmp.Fill( 15, 'X' ); - rStatusBar.InsertItem( SID_BASICIDE_STAT_POS, - rStatusBar.GetTextWidth( aTmp ), SIB_LEFT); - - // Insert/Overwrite - rStatusBar.InsertItem( SID_ATTR_INSERT, - rStatusBar.GetTextWidth( String( RTL_CONSTASCII_USTRINGPARAM( "XXXXX" /* "EINFG" */ ) ) ) ); - - // Uhrzeit - aTmp.Fill( 20, 'X' ); - rStatusBar.InsertItem( SID_ATTR_SIZE, - rStatusBar.GetTextWidth( aTmp ), SIB_AUTOSIZE | SIB_LEFT | SIB_USERDRAW ); - -// return pStatusBar; - -} - void BasicDocShell::FillClass( SvGlobalName*, sal_uInt32*, String*, String*, String*, sal_Int32, sal_Bool bTemplate) const { (void)bTemplate; diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx index 92aa8ed33..eff5afe19 100644 --- a/basctl/source/basicide/basdoc.hxx +++ b/basctl/source/basicide/basdoc.hxx @@ -39,7 +39,6 @@ class BasicDocShell: public SfxObjectShell SfxPrinter* pPrinter; protected: - virtual void FillStatusBar( StatusBar& rBar); virtual void Draw( OutputDevice *, const JobSetup & rSetup, USHORT nAspect = ASPECT_CONTENT ); virtual void FillClass( SvGlobalName * pClassName, diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 1c9e37ad6..93625b0ba 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -365,7 +365,7 @@ BOOL ModulWindow::BasicExecute() break; } } - else if ( !pMethod || ( nStart < nCurMethodStart ) ) + else if ( !pMethod || ( nStart < nCurMethodStart && !pM->IsHidden() ) ) { pMethod = pM; nCurMethodStart = nStart; diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 027ce45b6..3e0bcaab1 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -258,7 +258,7 @@ void __EXPORT EditorWindow::RequestHelp( const HelpEvent& rHEvt ) if ( rHEvt.GetMode() & HELPMODE_CONTEXT ) { String aKeyword = GetWordAtCursor(); - Application::GetHelp()->Start( aKeyword, this ); + Application::GetHelp()->SearchKeyword( aKeyword ); bDone = TRUE; } else if ( rHEvt.GetMode() & HELPMODE_QUICK ) diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index e307720fd..f98f31a4d 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -91,9 +91,7 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::resource; using namespace ::com::sun::star::ui::dialogs; -#if defined(MAC) -#define FILTERMASK_ALL "****" -#elif defined(OW) || defined(MTF) +#if defined(UNX) #define FILTERMASK_ALL "*" #elif defined(PM2) #define FILTERMASK_ALL "" diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx index 393dd4e02..78f40794c 100644 --- a/basctl/source/basicide/basides2.cxx +++ b/basctl/source/basicide/basides2.cxx @@ -51,7 +51,6 @@ #include <tools/diagnose_ex.h> #include <sfx2/sfxdefs.hxx> #include <sfx2/signaturestate.hxx> -#include <com/sun/star/script/XVBAModuleInfo.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 4f9242741..0dbe2c4e0 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -155,7 +155,11 @@ public: TYPEINIT1( BasicIDEShell, SfxViewShell ); +<<<<<<< local SFX_IMPL_VIEWFACTORY( BasicIDEShell ) +======= +SFX_IMPL_NAMED_VIEWFACTORY( BasicIDEShell, "Default" ) +>>>>>>> other { SFX_VIEW_REGISTRATION( BasicDocShell ); } diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src index 25c8c460d..880afec0d 100644 --- a/basctl/source/basicide/basidesh.src +++ b/basctl/source/basicide/basidesh.src @@ -31,6 +31,8 @@ #include <svx/globlmn.hrc> #endif #include "dlgresid.hrc" +#include <sfx2/sfxcommands.h> +#include <svx/svxcommands.h> #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; @@ -442,13 +444,13 @@ Menu RID_POPUP_TABBAR MenuItem { Identifier = SID_BASICIDE_NEWMODULE ; - HelpId = SID_BASICIDE_NEWMODULE ; + HelpId = CMD_SID_BASICIDE_NEWMODULE ; Text [ en-US ] = "BASIC Module" ; }; MenuItem { Identifier = SID_BASICIDE_NEWDIALOG ; - HelpId = SID_BASICIDE_NEWDIALOG ; + HelpId = CMD_SID_BASICIDE_NEWDIALOG ; Text [ en-US ] = "BASIC Dialog" ; }; }; @@ -458,7 +460,7 @@ Menu RID_POPUP_TABBAR MenuItem { Identifier = SID_BASICIDE_DELETECURRENT ; - HelpId = SID_BASICIDE_DELETECURRENT ; + HelpId = CMD_SID_BASICIDE_DELETECURRENT ; /* ### ACHTUNG: Neuer Text in Resource? Löschen : L÷schen */ Text [ en-US ] = "Delete" ; /* ### ACHTUNG: Neuer Text in Resource? Modul oder Dialog löschen : Modul oder Dialog l÷schen */ @@ -466,13 +468,13 @@ Menu RID_POPUP_TABBAR MenuItem { Identifier = SID_BASICIDE_RENAMECURRENT ; - HelpId = SID_BASICIDE_RENAMECURRENT ; + HelpId = CMD_SID_BASICIDE_RENAMECURRENT ; Text [ en-US ] = "Rename" ; }; MenuItem { Identifier = SID_BASICIDE_HIDECURPAGE ; - HelpId = SID_BASICIDE_HIDECURPAGE ; + HelpId = CMD_SID_BASICIDE_HIDECURPAGE ; Text [ en-US ] = "Hide" ; }; MenuItem @@ -482,7 +484,7 @@ Menu RID_POPUP_TABBAR MenuItem { Identifier = SID_BASICIDE_MODULEDLG ; - HelpId = SID_BASICIDE_MODULEDLG ; + HelpId = CMD_SID_BASICIDE_MODULEDLG ; Text [ en-US ] = "Modules..." ; }; }; @@ -495,7 +497,7 @@ Menu RID_POPUP_DLGED MenuItem { Identifier = SID_SHOW_PROPERTYBROWSER ; - HelpId = SID_SHOW_PROPERTYBROWSER ; + HelpId = CMD_SID_SHOW_PROPERTYBROWSER ; Text [ en-US ] = "Properties..."; }; }; diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index cf5386b1e..9f9af5724 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -364,13 +364,23 @@ Sequence< ::rtl::OUString > GetMethodNames( const ScriptDocument& rDocument, con SbModuleRef xModule = new SbModule( rModName ); xModule->SetSource32( aOUSource ); USHORT nCount = xModule->GetMethods()->Count(); - aSeqMethods.realloc( nCount ); - + USHORT nRealCount = nCount; for ( USHORT i = 0; i < nCount; i++ ) { SbMethod* pMethod = (SbMethod*)xModule->GetMethods()->Get( i ); + if( pMethod->IsHidden() ) + --nRealCount; + } + aSeqMethods.realloc( nRealCount ); + + USHORT iTarget = 0; + for ( USHORT i = 0 ; i < nCount; ++i ) + { + SbMethod* pMethod = (SbMethod*)xModule->GetMethods()->Get( i ); + if( pMethod->IsHidden() ) + continue; DBG_ASSERT( pMethod, "Method not found! (NULL)" ); - aSeqMethods.getArray()[ i ] = pMethod->GetName(); + aSeqMethods.getArray()[ iTarget++ ] = pMethod->GetName(); } } @@ -392,7 +402,7 @@ BOOL HasMethod( const ScriptDocument& rDocument, const String& rLibName, const S if ( pMethods ) { SbMethod* pMethod = (SbMethod*)pMethods->Find( rMethName, SbxCLASS_METHOD ); - if ( pMethod ) + if ( pMethod && !pMethod->IsHidden() ) bHasMethod = TRUE; } } diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index f112d5a06..9aac98d44 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -52,9 +52,8 @@ #include <comphelper/componentcontext.hxx> #include <map> #include <com/sun/star/script/ModuleType.hpp> -#include <com/sun/star/script/XVBAModuleInfo.hpp> +#include <com/sun/star/script/vba/XVBAModuleInfo.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/script/XVBAModuleInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNamed.hpp> @@ -65,7 +64,7 @@ void ModuleInfoHelper::getObjectName( const uno::Reference< container::XNameCont { try { - uno::Reference< script::XVBAModuleInfo > xVBAModuleInfo( rLib, uno::UNO_QUERY ); + uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( rLib, uno::UNO_QUERY ); if ( xVBAModuleInfo.is() && xVBAModuleInfo->hasModuleInfo( rModName ) ) { script::ModuleInfo aModuleInfo = xVBAModuleInfo->getModuleInfo( rModName ); @@ -86,8 +85,8 @@ void ModuleInfoHelper::getObjectName( const uno::Reference< container::XNameCont sal_Int32 ModuleInfoHelper::getModuleType( const uno::Reference< container::XNameContainer >& rLib, const String& rModName ) { - sal_Int32 nType = com::sun::star::script::ModuleType::NORMAL; - uno::Reference< script::XVBAModuleInfo > xVBAModuleInfo( rLib, uno::UNO_QUERY ); + sal_Int32 nType = script::ModuleType::NORMAL; + uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( rLib, uno::UNO_QUERY ); if ( xVBAModuleInfo.is() && xVBAModuleInfo->hasModuleInfo( rModName ) ) { script::ModuleInfo aModuleInfo = xVBAModuleInfo->getModuleInfo( rModName ); diff --git a/basctl/source/basicide/brkdlg.src b/basctl/source/basicide/brkdlg.src index cbb7e72f2..8471e8052 100644 --- a/basctl/source/basicide/brkdlg.src +++ b/basctl/source/basicide/brkdlg.src @@ -29,7 +29,7 @@ #include <brkdlg.hrc> ModalDialog RID_BASICIDE_BREAKPOINTDLG { - // HelpId = HID_BASICIDE_BRKPNTS ; + HelpId = "basctl:RID_BASICIDE_BREAKPOINTDLG" ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 178 , 116 ) ; @@ -37,6 +37,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG // Closeable = TRUE; ComboBox RID_CB_BRKPOINTS { + HelpID = "basctl:ComboBox:RID_BASICIDE_BREAKPOINTDLG:RID_CB_BRKPOINTS"; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 110 , 70 ) ; TabStop = TRUE ; @@ -55,6 +56,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG }; PushButton RID_PB_NEW { + HelpID = "basctl:PushButton:RID_BASICIDE_BREAKPOINTDLG:RID_PB_NEW"; Pos = MAP_APPFONT ( 122 , 57 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -62,6 +64,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG }; PushButton RID_PB_DEL { + HelpID = "basctl:PushButton:RID_BASICIDE_BREAKPOINTDLG:RID_PB_DEL"; Pos = MAP_APPFONT ( 122 , 74 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; /* ### ACHTUNG: Neuer Text in Resource? Löschen : L÷schen */ @@ -70,6 +73,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG }; CheckBox RID_CHKB_ACTIVE { + HelpID = "basctl:CheckBox:RID_BASICIDE_BREAKPOINTDLG:RID_CHKB_ACTIVE"; Pos = MAP_APPFONT ( 6 , 87 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; TabStop = TRUE ; @@ -89,6 +93,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG }; NumericField RID_FLD_PASS { + HelpID = "basctl:NumericField:RID_BASICIDE_BREAKPOINTDLG:RID_FLD_PASS"; Border = TRUE ; Pos = MAP_APPFONT ( 81 , 100 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index cfd9e06f4..8073b48d1 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -554,11 +554,15 @@ IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox ) // Die Macros sollen in der Reihenfolge angezeigt werden, // wie sie im Modul stehen. MacroList aMacros; - USHORT nMacros = pModule->GetMethods()->Count(); - USHORT nMethod; - for ( nMethod = 0; nMethod < nMacros; nMethod++ ) + USHORT nMacroCount = pModule->GetMethods()->Count(); + USHORT nRealMacroCount = 0; + USHORT iMeth; + for ( iMeth = 0; iMeth < nMacroCount; iMeth++ ) { - SbMethod* pMethod = (SbMethod*)pModule->GetMethods()->Get( nMethod ); + SbMethod* pMethod = (SbMethod*)pModule->GetMethods()->Get( iMeth ); + if( pMethod->IsHidden() ) + continue; + ++nRealMacroCount; DBG_ASSERT( pMethod, "Methode nicht gefunden! (NULL)" ); ULONG nPos = LIST_APPEND; // Eventuell weiter vorne ? @@ -580,8 +584,8 @@ IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox ) } aMacroBox.SetUpdateMode( FALSE ); - for ( nMethod = 0; nMethod < nMacros; nMethod++ ) - aMacroBox.InsertEntry( aMacros.GetObject( nMethod )->GetName() ); + for ( iMeth = 0; iMeth < nRealMacroCount; iMeth++ ) + aMacroBox.InsertEntry( aMacros.GetObject( iMeth )->GetName() ); aMacroBox.SetUpdateMode( TRUE ); if ( aMacroBox.GetEntryCount() ) diff --git a/basctl/source/basicide/macrodlg.src b/basctl/source/basicide/macrodlg.src index b4ef8b027..7792d8f7e 100644 --- a/basctl/source/basicide/macrodlg.src +++ b/basctl/source/basicide/macrodlg.src @@ -31,7 +31,7 @@ #include <helpid.hrc> ModalDialog RID_MACROCHOOSER { - // HelpId = SID_BASICCHOOSER ; + HelpId = "basctl:ModalDialog:RID_MACROCHOOSER" ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 287 , 165 ) ; @@ -70,6 +70,7 @@ ModalDialog RID_MACROCHOOSER }; Edit RID_ED_MACRONAME { + HelpID = "basctl:Edit:RID_MACROCHOOSER:RID_ED_MACRONAME"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; @@ -97,6 +98,7 @@ ModalDialog RID_MACROCHOOSER }; PushButton RID_PB_RUN { + HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_RUN"; Pos = MAP_APPFONT ( 231 , 6 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; DefButton = TRUE; @@ -114,6 +116,7 @@ ModalDialog RID_MACROCHOOSER PushButton RID_PB_ASSIGN { + HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_ASSIGN"; Pos = MAP_APPFONT ( 231 , 60 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Assign..." ; @@ -121,6 +124,7 @@ ModalDialog RID_MACROCHOOSER }; PushButton RID_PB_EDIT { + HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_EDIT"; Size = MAP_APPFONT ( 50 , 14 ) ; Pos = MAP_APPFONT ( 231 , 77 ) ; Text [ en-US ] = "~Edit" ; @@ -128,18 +132,21 @@ ModalDialog RID_MACROCHOOSER }; PushButton RID_PB_NEWLIB { + HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWLIB"; Pos = MAP_APPFONT ( 231 , 60 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "New ~Library"; }; PushButton RID_PB_NEWMOD { + HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWMOD"; Size = MAP_APPFONT ( 50 , 14 ) ; Pos = MAP_APPFONT ( 231 , 77 ) ; Text [ en-US ] = "New M~odule"; }; PushButton RID_PB_DEL { + HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_DEL"; Pos = MAP_APPFONT ( 231 , 94 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Löschen... : ~L÷schen... */ @@ -148,6 +155,7 @@ ModalDialog RID_MACROCHOOSER }; PushButton RID_PB_ORG { + HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_ORG"; Pos = MAP_APPFONT ( 231 , 114 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Organizer..." ; @@ -160,6 +168,7 @@ ModalDialog RID_MACROCHOOSER }; MultiLineEdit RID_ML_DESCRIPTION { + HelpID = "basctl:MultiLineEdit:RID_MACROCHOOSER:RID_ML_DESCRIPTION"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 131 ) ; Size = MAP_APPFONT ( 216 , 28 ) ; diff --git a/basctl/source/basicide/makefile.mk b/basctl/source/basicide/makefile.mk index b225b987b..452d698d0 100644 --- a/basctl/source/basicide/makefile.mk +++ b/basctl/source/basicide/makefile.mk @@ -81,7 +81,7 @@ SLOFILES = $(EXCEPTIONSFILES) \ $(SLO)$/objdlg.obj \ SRS1NAME=$(TARGET) -SRC1FILES= basidesh.src macrodlg.src moptions.src moduldlg.src objdlg.src brkdlg.src tbxctl.src basicprint.src +SRC1FILES= basidesh.src macrodlg.src moptions.src moduldlg.src objdlg.src brkdlg.src basicprint.src .INCLUDE : target.mk diff --git a/basctl/source/basicide/moduldlg.src b/basctl/source/basicide/moduldlg.src index 78ebad8b2..50661430f 100644 --- a/basctl/source/basicide/moduldlg.src +++ b/basctl/source/basicide/moduldlg.src @@ -64,7 +64,7 @@ TabDialog RID_TD_ORGANIZE }; TabPage RID_TP_MODULS { - // HelpId = HID_BASICIDE_MODULS ; + HelpId = "basctl:TabPage:RID_TP_MODULS" ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 210 , 140 ) ; @@ -84,6 +84,7 @@ TabPage RID_TP_MODULS }; PushButton RID_PB_EDIT { + HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_EDIT"; Text [ en-US ] = "~Edit"; Pos = MAP_APPFONT ( 144 , 6 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; @@ -99,6 +100,7 @@ TabPage RID_TP_MODULS }; PushButton RID_PB_NEWMOD { + HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_NEWMOD"; Pos = MAP_APPFONT ( 144 , 103 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~New..." ; @@ -106,6 +108,7 @@ TabPage RID_TP_MODULS }; PushButton RID_PB_NEWDLG { + HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_NEWDLG"; Pos = MAP_APPFONT ( 144 , 103 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~New..." ; @@ -113,6 +116,7 @@ TabPage RID_TP_MODULS }; PushButton RID_PB_DELETE { + HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_DELETE"; Pos = MAP_APPFONT ( 144 , 120 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Löschen... : ~L÷schen... */ @@ -122,6 +126,7 @@ TabPage RID_TP_MODULS }; TabPage RID_TP_DLGS { + HelpID = "basctl:TabPage:RID_TP_DLGS"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 210 , 140 ) ; @@ -141,6 +146,7 @@ TabPage RID_TP_DLGS }; PushButton RID_PB_EDIT { + HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_EDIT"; Text [ en-US ] = "~Edit"; Pos = MAP_APPFONT ( 144 , 6 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; @@ -156,6 +162,7 @@ TabPage RID_TP_DLGS }; PushButton RID_PB_NEWMOD { + HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_NEWMOD"; Pos = MAP_APPFONT ( 144 , 103 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~New..." ; @@ -163,6 +170,7 @@ TabPage RID_TP_DLGS }; PushButton RID_PB_NEWDLG { + HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_NEWDLG"; Pos = MAP_APPFONT ( 144 , 103 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~New..." ; @@ -170,6 +178,7 @@ TabPage RID_TP_DLGS }; PushButton RID_PB_DELETE { + HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_DELETE"; Pos = MAP_APPFONT ( 144 , 120 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Löschen... : ~L÷schen... */ @@ -179,7 +188,7 @@ TabPage RID_TP_DLGS }; TabPage RID_TP_LIBS { - // HelpId = HID_BASICIDE_LIBS_TP ; + HelpId = "basctl:TabPage:RID_TP_LIBS" ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 210 , 140 ) ; @@ -191,6 +200,7 @@ TabPage RID_TP_LIBS }; ListBox RID_LB_BASICS { + HelpID = "basctl:ListBox:RID_TP_LIBS:RID_LB_BASICS"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 130 , 80 ) ; @@ -214,6 +224,7 @@ TabPage RID_TP_LIBS PushButton RID_PB_EDIT { + HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_EDIT"; Text [ en-US ] = "~Edit"; Pos = MAP_APPFONT ( 144 , 6 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; @@ -230,6 +241,7 @@ TabPage RID_TP_LIBS }; PushButton RID_PB_PASSWORD { + HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_PASSWORD"; Pos = MAP_APPFONT ( 144 , 43 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Password..." ; @@ -238,6 +250,7 @@ TabPage RID_TP_LIBS PushButton RID_PB_NEWLIB { + HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_NEWLIB"; Pos = MAP_APPFONT ( 144 , 69 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~New..." ; @@ -245,6 +258,7 @@ TabPage RID_TP_LIBS }; PushButton RID_PB_APPEND { + HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_APPEND"; Pos = MAP_APPFONT ( 144 , 86 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; /* ### ACHTUNG: Neuer Text in Resource? Hin~zufügen... : Hin~zuf³gen... */ @@ -252,6 +266,7 @@ TabPage RID_TP_LIBS }; PushButton RID_PB_EXPORT { + HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_EXPORT"; Pos = MAP_APPFONT ( 144 , 103 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "E~xport..." ; @@ -259,6 +274,7 @@ TabPage RID_TP_LIBS }; PushButton RID_PB_DELETE { + HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_DELETE"; Pos = MAP_APPFONT ( 144 , 120 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Löschen... : ~L÷schen... */ @@ -268,7 +284,7 @@ TabPage RID_TP_LIBS }; ModalDialog RID_DLG_LIBS { - // HelpId = HID_BASICIDE_LIBS_DLG ; + HelpId = "basctl:ModalDialog:RID_DLG_LIBS" ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 168 , 132 ) ; @@ -308,6 +324,7 @@ ModalDialog RID_DLG_LIBS }; CheckBox RID_CB_REF { + HelpID = "basctl:CheckBox:RID_DLG_LIBS:RID_CB_REF"; Pos = MAP_APPFONT ( 12 , 100 ) ; Size = MAP_APPFONT ( 146 , 10 ) ; TabStop = TRUE ; @@ -315,6 +332,7 @@ ModalDialog RID_DLG_LIBS }; CheckBox RID_CB_REPL { + HelpID = "basctl:CheckBox:RID_DLG_LIBS:RID_CB_REPL"; Pos = MAP_APPFONT ( 12 , 113 ) ; Size = MAP_APPFONT ( 146 , 10 ) ; Text [ en-US ] = "Replace existing libraries" ; @@ -322,6 +340,7 @@ ModalDialog RID_DLG_LIBS }; ModalDialog RID_DLG_NEWLIB { + HelpID = "basctl:ModalDialog:RID_DLG_NEWLIB"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 160 , 55 ) ; @@ -348,6 +367,7 @@ ModalDialog RID_DLG_NEWLIB }; Edit RID_ED_LIBNAME { + HelpID = "basctl:Edit:RID_DLG_NEWLIB:RID_ED_LIBNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 19 ) ; Size = MAP_APPFONT ( 92 , 12 ) ; @@ -357,6 +377,7 @@ ModalDialog RID_DLG_NEWLIB ModalDialog RID_DLG_EXPORT { + HelpID = "basctl:ModalDialog:RID_DLG_EXPORT"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 115 , 55 ) ; @@ -379,6 +400,7 @@ ModalDialog RID_DLG_EXPORT RadioButton RB_EXPORTASPACKAGE { + HelpID = "basctl:RadioButton:RID_DLG_EXPORT:RB_EXPORTASPACKAGE"; Pos = MAP_APPFONT( 6, 6 ); Size = MAP_APPFONT( 103, 10 ); Group = TRUE; @@ -387,6 +409,7 @@ ModalDialog RID_DLG_EXPORT }; RadioButton RB_EXPORTASBASIC { + HelpID = "basctl:RadioButton:RID_DLG_EXPORT:RB_EXPORTASBASIC"; Pos = MAP_APPFONT( 6, 19 ); Size = MAP_APPFONT( 103, 10 ); //Group = TRUE; diff --git a/basctl/source/basicide/moptions.src b/basctl/source/basicide/moptions.src index 32cb236a0..e300d4f73 100644 --- a/basctl/source/basicide/moptions.src +++ b/basctl/source/basicide/moptions.src @@ -29,7 +29,7 @@ #include <moptions.hrc> ModalDialog RID_MACROOPTIONS { - // HelpId = HID_MACRO_OPTIONS ; + HelpId = "basctl:ModalDialog:RID_MACROOPTIONS" ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 224 , 121 ) ; @@ -70,6 +70,7 @@ ModalDialog RID_MACROOPTIONS }; MultiLineEdit RID_ME_DESCR { + HelpID = "basctl:MultiLineEdit:RID_MACROOPTIONS:RID_ME_DESCR"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 6 , 32 ) ; @@ -93,6 +94,7 @@ ModalDialog RID_MACROOPTIONS }; NumericField RID_NF_HELPID { + HelpID = "basctl:NumericField:RID_MACROOPTIONS:RID_NF_HELPID"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 95 , 83 ) ; @@ -110,6 +112,7 @@ ModalDialog RID_MACROOPTIONS }; Edit RID_ED_HELPNAME { + HelpID = "basctl:Edit:RID_MACROOPTIONS:RID_ED_HELPNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 95 , 99 ) ; Size = MAP_APPFONT ( 120 , 12 ) ; diff --git a/basctl/source/basicide/objdlg.src b/basctl/source/basicide/objdlg.src index b66b68a2d..6f379ed4c 100644 --- a/basctl/source/basicide/objdlg.src +++ b/basctl/source/basicide/objdlg.src @@ -32,6 +32,7 @@ FloatingWindow RID_BASICIDE_OBJCAT { + HelpID = "basctl:FloatingWindow:RID_BASICIDE_OBJCAT"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 191 , 179 ) ; diff --git a/basctl/source/basicide/register.cxx b/basctl/source/basicide/register.cxx index 6b46ae398..dd885a15c 100644 --- a/basctl/source/basicide/register.cxx +++ b/basctl/source/basicide/register.cxx @@ -53,28 +53,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( } SAL_DLLPUBLIC_EXPORT -sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , - void* pRegistryKey ) -{ - (void)pServiceManager; - - Reference< ::registry::XRegistryKey > - xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ; - - OUString aDelimiter( RTL_CONSTASCII_USTRINGPARAM("/") ); - OUString aUnoServices( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ); - - sal_Int32 i; - Reference< ::registry::XRegistryKey > xNewKey; - xNewKey = xKey->createKey( aDelimiter + SIDEModel::getImplementationName_Static() + aUnoServices ); - Sequence< OUString > aServices = SIDEModel::getSupportedServiceNames_Static(); - for(i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[i] ); - - return sal_True; -} - -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey ) diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index 5fc34d9f7..cfbd761c1 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -53,8 +53,8 @@ #include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/document/XEmbeddedScripts.hpp> -#include <com/sun/star/script/XVBAModuleInfo.hpp> -#include <com/sun/star/script/XVBACompat.hpp> +#include <com/sun/star/script/vba/XVBACompatibility.hpp> +#include <com/sun/star/script/vba/XVBAModuleInfo.hpp> /** === end UNO includes === **/ #include <sfx2/objsh.hxx> @@ -142,8 +142,8 @@ namespace basctl using ::com::sun::star::document::XEventBroadcaster; using ::com::sun::star::document::XEmbeddedScripts; using ::com::sun::star::script::ModuleInfo; - using ::com::sun::star::script::XVBAModuleInfo; - using ::com::sun::star::script::XVBACompat; + using ::com::sun::star::script::vba::XVBACompatibility; + using ::com::sun::star::script::vba::XVBAModuleInfo; /** === end UNO using === **/ namespace MacroExecMode = ::com::sun::star::document::MacroExecMode; namespace FrameSearchFlag = ::com::sun::star::frame::FrameSearchFlag; @@ -456,9 +456,9 @@ namespace basctl #ifdef FUTURE_VBA_CWS if ( !isApplication() ) { - Reference< XVBACompat > xVBACompat( getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); + Reference< XVBACompatibility > xVBACompat( getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); if ( xVBACompat.is() ) - bResult = xVBACompat->getVBACompatModeOn(); + bResult = xVBACompat->getVBACompatibilityMode(); } #endif return bResult; diff --git a/basctl/source/basicide/tbxctl.src b/basctl/source/basicide/tbxctl.src deleted file mode 100644 index defe36e46..000000000 --- a/basctl/source/basicide/tbxctl.src +++ /dev/null @@ -1,273 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "svx/svxids.hrc" -#include "tbxctl.hrc" -#include "helpid.hrc" -FloatingWindow RID_TBXCONTROLS -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - HelpId = HID_BASICIDE_CONTROLS ; - Text [ en-US ] = "Controls" ; - String RID_TOOLBOX - { - Text [ en-US ] = "Controls" ; - }; -}; -ToolBox RID_TOOLBOX -{ - SVLook = TRUE ; - // HelpId = HID_BASICIDE_CONTROLS ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - HelpId = SID_INSERT_PUSHBUTTON ; - Identifier = SID_INSERT_PUSHBUTTON ; - RadioCheck = TRUE ; - Text [ en-US ] = "Button" ; - /* ### ACHTUNG: Neuer Text in Resource? CommandButton einfügen : CommandButton einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_CHECKBOX ; - Identifier = SID_INSERT_CHECKBOX ; - RadioCheck = TRUE ; - Text [ en-US ] = "Check Box" ; - /* ### ACHTUNG: Neuer Text in Resource? CheckBox einfügen : CheckBox einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_FIXEDTEXT ; - Identifier = SID_INSERT_FIXEDTEXT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Label field" ; - /* ### ACHTUNG: Neuer Text in Resource? Label einfügen : Label einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_LISTBOX ; - Identifier = SID_INSERT_LISTBOX ; - RadioCheck = TRUE ; - Text [ en-US ] = "List Box" ; - /* ### ACHTUNG: Neuer Text in Resource? ListBox einfügen : ListBox einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_HSCROLLBAR ; - Identifier = SID_INSERT_HSCROLLBAR ; - RadioCheck = TRUE ; - Text [ en-US ] = "Horizontal Scroll Bar" ; - /* ### ACHTUNG: Neuer Text in Resource? Horizontale ScrollBar einfügen : Horizontale ScrollBar einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_GROUPBOX ; - Identifier = SID_INSERT_GROUPBOX ; - RadioCheck = TRUE ; - Text [ en-US ] = "Group Box" ; - /* ### ACHTUNG: Neuer Text in Resource? GroupBox einfügen : GroupBox einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_HFIXEDLINE ; - Identifier = SID_INSERT_HFIXEDLINE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Horizontal Line" ; - }; - ToolBoxItem - { - HelpId = SID_INSERT_DATEFIELD ; - Identifier = SID_INSERT_DATEFIELD ; - RadioCheck = TRUE ; - Text [ en-US ] = "Date Field"; - }; - ToolBoxItem - { - HelpId = SID_INSERT_NUMERICFIELD ; - Identifier = SID_INSERT_NUMERICFIELD ; - RadioCheck = TRUE ; - Text [ en-US ] = "Numeric Field"; - }; - ToolBoxItem - { - HelpId = SID_INSERT_FORMATTEDFIELD ; - Identifier = SID_INSERT_FORMATTEDFIELD ; - RadioCheck = TRUE ; - Text [ en-US ] = "Formatted Field"; - }; - ToolBoxItem - { - HelpId = SID_INSERT_FILECONTROL ; - Identifier = SID_INSERT_FILECONTROL ; - RadioCheck = TRUE ; - Text [ en-US ] = "File Selection"; - }; - ToolBoxItem - { - HelpId = SID_INSERT_TREECONTROL ; - Identifier = SID_INSERT_TREECONTROL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Tree Control"; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - HelpId = SID_SHOW_PROPERTYBROWSER ; - Identifier = SID_SHOW_PROPERTYBROWSER ; - Text [ en-US ] = "Properties" ; - }; - ToolBoxItem { Type = TOOLBOXITEM_BREAK ; }; - ToolBoxItem - { - HelpId = SID_INSERT_IMAGECONTROL ; - Identifier = SID_INSERT_IMAGECONTROL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Image Control" ; - }; - ToolBoxItem - { - HelpId = SID_INSERT_RADIOBUTTON ; - Identifier = SID_INSERT_RADIOBUTTON ; - RadioCheck = TRUE ; - Text [ en-US ] = "Option Button" ; - /* ### ACHTUNG: Neuer Text in Resource? RadioButton einfügen : RadioButton einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_EDIT ; - Identifier = SID_INSERT_EDIT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Text Box" ; - /* ### ACHTUNG: Neuer Text in Resource? Edit einfügen : Edit einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_COMBOBOX ; - Identifier = SID_INSERT_COMBOBOX ; - RadioCheck = TRUE ; - Text [ en-US ] = "Combo Box" ; - /* ### ACHTUNG: Neuer Text in Resource? ComboBox einfügen : ComboBox einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_VSCROLLBAR ; - Identifier = SID_INSERT_VSCROLLBAR ; - RadioCheck = TRUE ; - Text [ en-US ] = "Vertical Scroll Bar" ; - /* ### ACHTUNG: Neuer Text in Resource? Vertikale ScrollBar einfügen : Vertikale ScrollBar einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_PROGRESSBAR ; - Identifier = SID_INSERT_PROGRESSBAR ; - RadioCheck = TRUE ; - Text [ en-US ] = "Progress Bar" ; - }; - ToolBoxItem - { - HelpId = SID_INSERT_VFIXEDLINE ; - Identifier = SID_INSERT_VFIXEDLINE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Vertical Line" ; - }; - ToolBoxItem - { - HelpId = SID_INSERT_TIMEFIELD ; - Identifier = SID_INSERT_TIMEFIELD ; - RadioCheck = TRUE ; - Text [ en-US ] = "Time Field"; - }; - ToolBoxItem - { - HelpId = SID_INSERT_CURRENCYFIELD ; - Identifier = SID_INSERT_CURRENCYFIELD ; - RadioCheck = TRUE ; - Text [ en-US ] = "Currency Field"; - }; - ToolBoxItem - { - HelpId = SID_INSERT_PATTERNFIELD ; - Identifier = SID_INSERT_PATTERNFIELD ; - RadioCheck = TRUE ; - Text [ en-US ] = "Pattern Field"; - }; - ToolBoxItem - { - HelpId = SID_INSERT_SELECT ; - Identifier = SID_INSERT_SELECT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Select" ; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - HelpId = SID_DIALOG_TESTMODE ; - Identifier = SID_DIALOG_TESTMODE ; - Text [ en-US ] = "Activate Test Mode" ; - }; - }; -}; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/basctl/source/dlged/managelang.src b/basctl/source/dlged/managelang.src index 6b54abcb1..822502ff9 100644 --- a/basctl/source/dlged/managelang.src +++ b/basctl/source/dlged/managelang.src @@ -45,6 +45,7 @@ ModalDialog RID_DLG_MANAGE_LANGUAGE }; ListBox LB_LANGUAGE { + HelpID = "basctl:ListBox:RID_DLG_MANAGE_LANGUAGE:LB_LANGUAGE"; Pos = MAP_APPFONT ( MANAGE_COL1 , MANAGE_ROW2 ) ; Size = MAP_APPFONT ( MANAGE_LB_WIDTH , MANAGE_LB_HEIGHT ) ; Border = TRUE; @@ -52,6 +53,7 @@ ModalDialog RID_DLG_MANAGE_LANGUAGE }; PushButton PB_ADD_LANG { + HelpID = "basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_ADD_LANG"; Pos = MAP_APPFONT ( MANAGE_COL3 , MANAGE_ROW2 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -59,6 +61,7 @@ ModalDialog RID_DLG_MANAGE_LANGUAGE }; PushButton PB_DEL_LANG { + HelpID = "basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_DEL_LANG"; Pos = MAP_APPFONT ( MANAGE_COL3 , MANAGE_ROW3 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -66,6 +69,7 @@ ModalDialog RID_DLG_MANAGE_LANGUAGE }; PushButton PB_MAKE_DEFAULT { + HelpID = "basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_MAKE_DEFAULT"; Pos = MAP_APPFONT ( MANAGE_COL3 , MANAGE_ROW4 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -135,6 +139,7 @@ ModalDialog RID_DLG_SETDEF_LANGUAGE }; ListBox LB_DEF_LANGUAGE { + HelpID = "basctl:ListBox:RID_DLG_SETDEF_LANGUAGE:LB_DEF_LANGUAGE"; Pos = MAP_APPFONT ( SETDEF_COL1 , SETDEF_ROW2 ) ; Size = MAP_APPFONT ( SETDEF_LB_WIDTH , SETDEF_LB_HEIGHT ) ; Border = TRUE; diff --git a/basctl/util/basctl.component b/basctl/util/basctl.component new file mode 100644 index 000000000..f101deaf2 --- /dev/null +++ b/basctl/util/basctl.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.basic.BasicIDE"> + <service name="com.sun.star.script.BasicIDE"/> + </implementation> +</component> diff --git a/basctl/util/basctl.map b/basctl/util/basctl.map index 80359606c..83193fe17 100755 --- a/basctl/util/basctl.map +++ b/basctl/util/basctl.map @@ -4,7 +4,6 @@ UDK_3_0_0 { basicide_macro_organizer; basicide_handle_basic_error; component_getImplementationEnvironment; - component_writeInfo; component_getFactory; local: *; diff --git a/basctl/util/hidother.src b/basctl/util/hidother.src index ece6f8344..bf8e64f2d 100644 --- a/basctl/util/hidother.src +++ b/basctl/util/hidother.src @@ -25,7 +25,6 @@ * ************************************************************************/ #include "../inc/helpid.hrc" // HID_XXX -//#include "hidother.hrc" hidspecial HID_BASICIDE_PROP_BROWSER_LBOX { HelpID = HID_BASICIDE_PROP_BROWSER_LBOX; }; hidspecial HID_BASICIDE_PROP_BROWSER { HelpID = HID_BASICIDE_PROP_BROWSER; }; diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk index 59bfc51c0..e690a5a20 100644 --- a/basctl/util/makefile.mk +++ b/basctl/util/makefile.mk @@ -101,3 +101,11 @@ RESLIB1SRSFILES= $(SRSFILELIST) .ENDIF # "$(header)" == "" + +ALLTAR : $(MISC)/basctl.component + +$(MISC)/basctl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + basctl.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt basctl.component diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index c645de536..d398cf7c2 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -153,7 +153,18 @@ public class LocalOfficeConnection {} } - /** + /** + * protected Constructor + * Initialise a LocalOfficeConnection with an already running office. + * This C'Tor is only used in complex tests at the moment. + * @param xContext + */ + protected LocalOfficeConnection(com.sun.star.uno.XComponentContext xContext) + { + this.mContext = xContext; + } + + /** * Sets a connection URL. * This implementation accepts a UNO URL with following format:<br /> * <pre> diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java index 8727ac8cc..a9f79228b 100644 --- a/bean/com/sun/star/comp/beans/OOoBean.java +++ b/bean/com/sun/star/comp/beans/OOoBean.java @@ -601,8 +601,15 @@ public class OOoBean xURLTransformer = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface( com.sun.star.util.XURLTransformer.class, xServiceFactory.createInstance( "com.sun.star.util.URLTransformer") ); - xDispatcher = (com.sun.star.frame.XDispatchProvider)UnoRuntime.queryInterface( - com.sun.star.frame.XDispatchProvider.class, aFrame ); + + try + { + xDispatcher = UnoRuntime.queryInterface(com.sun.star.frame.XDispatchProvider.class, aFrame); + } + catch (Exception e) + { + /*ignore!*/ + } // get XComponentLoader from frame com.sun.star.frame.XComponentLoader xLoader = (com.sun.star.frame.XComponentLoader) diff --git a/bean/prj/build.lst b/bean/prj/build.lst index 3767e8fff..91d443344 100644 --- a/bean/prj/build.lst +++ b/bean/prj/build.lst @@ -4,3 +4,7 @@ ob bean\com\sun\star\beans nmake - all ob_legacybeanjava ob_beanjava NULL ob bean\native\win32 nmake - n ob_beanwin32 NULL ob bean\native\unix nmake - u ob_beanunix NULL ob bean\util nmake - all ob_util ob_beanjava ob_legacybeanjava ob_beanwin32.n ob_beanunix.u NULL + +# complex tests compileable but fail at runtime +# ob bean\qa\complex\bean nmake - all ob_qa_complex ob_util NULL + diff --git a/bean/qa/complex/OOoBeanTest.java b/bean/qa/complex/bean/OOoBeanTest.java index 791c3abaa..1a4b81cbd 100644 --- a/bean/qa/complex/OOoBeanTest.java +++ b/bean/qa/complex/bean/OOoBeanTest.java @@ -24,86 +24,90 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex; - - -import complexlib.ComplexTestCase; -import java.io.*; -import java.awt.Rectangle; -import java.awt.Insets; -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.awt.GridBagLayout; -import java.awt.GridBagConstraints; +package complex.bean; + + +// import complexlib.ComplexTestCase; +import com.sun.star.lang.XMultiServiceFactory; import java.awt.event.*; -import java.awt.Frame; -import java.awt.Toolkit; -import java.awt.Robot; import java.awt.event.KeyEvent; -import java.awt.Button; -import javax.imageio.ImageIO; -import javax.imageio.stream.FileImageOutputStream; import com.sun.star.comp.beans.OOoBean; import com.sun.star.uno.UnoRuntime; -import com.sun.star.text.XTextDocument; import java.awt.*; -public class OOoBeanTest extends ComplexTestCase +// import org.junit.After; +import org.junit.AfterClass; +// import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +class PrivateLocalOfficeConnection extends com.sun.star.comp.beans.LocalOfficeConnection { - - public String[] getTestMethodNames() + public PrivateLocalOfficeConnection(com.sun.star.uno.XComponentContext xContext) { - // TODO think about trigger of sub-tests from outside - return new String[] - { - "test1", - "test2", - "test3", - "test4", - "test5", - "test6", - "test6a", - "test7", - "test8" - }; + super(xContext); } +} + +public class OOoBeanTest +{ + +// public String[] getTestMethodNames() +// { +// // TODO think about trigger of sub-tests from outside +// return new String[] +// { +// "test1", +// "test2", +// "test3", +// "test4", +// "test5", +// "test6", +// "test6a", +// "test7", +// "test8" +// }; +// } /** For X-Windows we need to prolong the time between painting windows. Because it takes longer than on Windows. */ - int getSleepTime(int time) + private int getSleepTime(int time) { int ret = time; if (isWindows() == false) + { return time * 5; + } return time; } /** If it cannot be determined if we run on Windows then we assume that we do not. */ - boolean isWindows() + private boolean isWindows() { boolean ret = false; String os = System.getProperty("os.name"); if (os != null) { os = os.trim(); - if (os.indexOf("Win") == 0) + if (os.toLowerCase().indexOf("win") == 0) + { ret = true; + } } return ret; } - public String getText(OOoBean bean) throws Exception + private String getText(OOoBean bean) throws Exception { com.sun.star.frame.XModel model = (com.sun.star.frame.XModel)bean.getDocument(); com.sun.star.text.XTextDocument myDoc = - (XTextDocument) UnoRuntime.queryInterface(com.sun.star.text.XTextDocument.class, - model); + UnoRuntime.queryInterface(com.sun.star.text.XTextDocument.class, model); com.sun.star.text.XText xText = myDoc.getText(); return xText.getString(); } @@ -112,34 +116,40 @@ public class OOoBeanTest extends ComplexTestCase * 2.Add OOoBean (no document loaded yet) * 3.Show frame * 4.Load document + * @throws Exception */ - public void test1() throws Exception + @Test public void test1() throws Exception { WriterFrame f = null; try { - f = new WriterFrame(100 ,100, 500 ,400, false); + f = new WriterFrame(100 ,100, 500 ,400, false, connection.getComponentContext()); f.setText("OOoBean test."); Thread.sleep(1000); } finally { if (f != null) + { f.dispose(); + } } } /** Sizing, painting + * @throws Exception */ - public void test2() throws Exception + @Test public void test2() throws Exception { WriterFrame f = null; ScreenComparer capturer = null; try { - f = new WriterFrame(100, 100, 500,500, false); + f = new WriterFrame(100, 100, 500,500, false, connection.getComponentContext()); if (f.checkUnoFramePosition() == false) - failed("Sizing error: Client are of Java frame does not match the UNO window.", true); + { + fail("Sizing error: Client are of Java frame does not match the UNO window."); + } capturer = new ScreenComparer(100, 100, 500, 500); //Minimize Window and back @@ -153,15 +163,19 @@ public class OOoBeanTest extends ComplexTestCase f.setExtendedState(Frame.ICONIFIED); Thread.sleep(getSleepTime(200)); if (f.checkUnoFramePosition() == false) - failed("Sizing error: Frame was iconified.", true); + { + fail("Sizing error: Frame was iconified."); + } f.setExtendedState(Frame.NORMAL); Thread.sleep(getSleepTime(200)); if (f.checkUnoFramePosition() == false) - failed("Sizing error: Frame size set back to normal after it was iconified.", true); + { + fail("Sizing error: Frame size set back to normal after it was iconified."); + } capturer.grabTwo(f.getClientArea()); if (capturer.compare() == false) { - failed("Painting error: Minimize (iconify) frame and back to normal size.", true); + fail("Painting error: Minimize (iconify) frame and back to normal size."); capturer.writeImages(); } } @@ -174,15 +188,19 @@ public class OOoBeanTest extends ComplexTestCase f.setExtendedState(Frame.MAXIMIZED_BOTH); Thread.sleep(getSleepTime(200)); if (f.checkUnoFramePosition() == false) - failed("Sizing error: Frame maximized.", true); + { + fail("Sizing error: Frame maximized."); + } f.setExtendedState(Frame.NORMAL); Thread.sleep(getSleepTime(200)); if (f.checkUnoFramePosition() == false) - failed("Sizing error: Frame set from maximized to normal.", true); + { + fail("Sizing error: Frame set from maximized to normal."); + } capturer.grabTwo(f.getClientArea()); if (capturer.compare() == false) { - failed("Painting error: Maximize frame and back to normal size", true); + fail("Painting error: Maximize frame and back to normal size"); capturer.writeImages(); } } @@ -194,12 +212,14 @@ public class OOoBeanTest extends ComplexTestCase f.setBounds(0, 0, oldPosition.width, oldPosition.height); Thread.sleep(getSleepTime(200)); if (f.checkUnoFramePosition() == false) - failed("Sizing error: Frame moved.", true); + { + fail("Sizing error: Frame moved."); + } capturer.grabTwo(f.getClientArea()); if (capturer.compare() == false) { - failed("Painting error: Move frame to a different position.", true); + fail("Painting error: Move frame to a different position."); capturer.writeImages(); } @@ -217,7 +237,7 @@ public class OOoBeanTest extends ComplexTestCase capturer.grabTwo(f.getClientArea()); if (capturer.compare() == false) { - failed("Painting error: Move frame to a different position.", true); + fail("Painting error: Move frame to a different position."); capturer.writeImages(); } curY+= 50; @@ -242,12 +262,14 @@ public class OOoBeanTest extends ComplexTestCase f.toFront(); Thread.sleep(getSleepTime(200)); if (f.checkUnoFramePosition() == false) - failed("Sizing error: Frame moved from back to front.", true); + { + fail("Sizing error: Frame moved from back to front."); + } capturer.grabTwo(f.getClientArea()); if (capturer.compare() == false) { - failed("Painting error: Move frame to back and to front.", true); + fail("Painting error: Move frame to back and to front."); capturer.writeImages(); } } @@ -257,7 +279,9 @@ public class OOoBeanTest extends ComplexTestCase finally { if (f != null) + { f.dispose(); + } } } @@ -267,33 +291,39 @@ public class OOoBeanTest extends ComplexTestCase 3. Create Frame (do not show yet) 4. Add OOoBean to Frame 5. Show Frame - */ - public void test3() throws Exception + * @throws Exception + */ + @Test public void test3() throws Exception { WriterFrame f = null; try { - f = new WriterFrame(100, 100, 500, 300, true); + f = new WriterFrame(100, 100, 500, 300, true, connection.getComponentContext()); if (f.checkUnoFramePosition() == false) - failed("Sizing error.", true); + { + fail("Sizing error."); + } } finally { if (f != null) + { f.dispose(); + } } } /** Test repeated OOoBean.aquireSystemWindow and OOoBean.releaseSystemWindow * calls. + * @throws Exception */ - public void test4() throws Exception + @Test public void test4() throws Exception { WriterFrame f = null; try { - f = new WriterFrame(100, 100, 500, 300, false); + f = new WriterFrame(100, 100, 500, 300, false, connection.getComponentContext()); OOoBean b = f.getBean(); for (int i = 0; i < 100; i++) { @@ -301,26 +331,33 @@ public class OOoBeanTest extends ComplexTestCase b.aquireSystemWindow(); } if (f.checkUnoFramePosition() == false) - failed("Sizing error.", true); + { + fail("Sizing error."); + } } finally { if (f != null) + { f.dispose(); + } if (isWindows() == false) + { Thread.sleep(10000); + } } } /** Adding and removing the bean to a Java frame multiple times. * Test painting and sizing. + * @throws Exception */ - public void test5() throws Exception + @Test public void test5() throws Exception { WriterFrame f = null; try { - f = new WriterFrame(100, 100, 500, 400, false); + f = new WriterFrame(100, 100, 500, 400, false, connection.getComponentContext()); f.goToStart(); f.pageDown(); Thread.sleep(1000); @@ -340,21 +377,27 @@ public class OOoBeanTest extends ComplexTestCase if (capturer.compare() == false) { - failed("Painting error: adding and removing OOoBean " + - "repeatedly to java.lang.Frame.", true); + fail("Painting error: adding and removing OOoBean " + + "repeatedly to java.lang.Frame."); capturer.writeImages(); } if (f.checkUnoFramePosition() == false) - failed("Sizing error.", true); + { + fail("Sizing error."); + } } finally { if (f != null) + { f.dispose(); + } if (isWindows() == false) + { Thread.sleep(10000); + } } } @@ -363,12 +406,13 @@ public class OOoBeanTest extends ComplexTestCase * it should still be possible to enter text in the window. This does not * work all the time on Windows. This is probably a timing problem. When using * Thread.sleep (position #1) then it should work. + * @throws Exception */ - public void test6() throws Exception + @Test public void test6() throws Exception { for (int j = 0; j < 10; j++) { - final OOoBean bean = new OOoBean(); + final OOoBean bean = new OOoBean(new PrivateLocalOfficeConnection(connection.getComponentContext())); java.awt.Frame frame = null; bean.setOOoCallTimeOut(10000); try { @@ -395,7 +439,9 @@ public class OOoBeanTest extends ComplexTestCase } if (isWindows() == false) + { Thread.sleep(5000); + } Robot roby = new Robot(); roby.keyPress(KeyEvent.VK_H); @@ -405,10 +451,10 @@ public class OOoBeanTest extends ComplexTestCase String s = getText(bean); if ( ! s.equals(buf.toString())) { - failed("Focus error: After removing and adding the bean, the" + + fail("Focus error: After removing and adding the bean, the" + "office window does not receive keyboard input.\n" + "Try typing in the window, you've got 30s!!! This " + - "test may not work with Linux/Solaris", true); + "test may not work with Linux/Solaris"); Thread.sleep(30000); break; } @@ -428,12 +474,13 @@ public class OOoBeanTest extends ComplexTestCase * different. The bean is added and removed from withing the event dispatch * thread. Using Thread.sleep at various points (#1, #2, #3) seems to workaround * the problem. + * @throws Exception */ - public void test6a() throws Exception + @Test public void test6a() throws Exception { for (int j = 0; j < 50; j++) { - final OOoBean bean = new OOoBean(); + final OOoBean bean = new OOoBean(new PrivateLocalOfficeConnection(connection.getComponentContext())); final java.awt.Frame frame = new Frame("Openoffice.org"); bean.setOOoCallTimeOut(10000); @@ -486,7 +533,9 @@ public class OOoBeanTest extends ComplexTestCase } if (isWindows() == false) + { Thread.sleep(5000); + } Robot roby = new Robot(); roby.mouseMove(300, 200); @@ -521,10 +570,10 @@ public class OOoBeanTest extends ComplexTestCase if ( ! sH.equals(s2)) { - failed("Focus error: After removing and adding the bean, the" + + fail("Focus error: After removing and adding the bean, the" + "office window does not receive keyboard input.\n" + "Try typing in the window, you've got 30s!!! This " + - "test may not work with Linux/Solaris", true); + "test may not work with Linux/Solaris"); System.out.println("j: " + j + " i: " + i); Thread.sleep(30000); break; @@ -543,13 +592,14 @@ public class OOoBeanTest extends ComplexTestCase } /** Repeatedly loading a document in one and the same OOoBean instance. + * @throws Exception */ - public void test7() throws Exception + @Test public void test7() throws Exception { WriterFrame f = null; try { - f = new WriterFrame(100 ,100, 500 ,400, false); + f = new WriterFrame(100 ,100, 500 ,400, false, connection.getComponentContext()); String text = "OOoBean test."; for (int i = 0; i < 10; i++) @@ -561,28 +611,34 @@ public class OOoBeanTest extends ComplexTestCase f.validate(); if (text.equals(f.getText()) == false) - failed("Repeated loading of a document failed."); + { + fail("Repeated loading of a document failed."); + } Thread.sleep(1000); } } finally { if (f != null) + { f.dispose(); + } } } /** Using multiple instances of OOoBean at the same time + * @throws Exception */ - public void test8() throws Exception + + @Test public void test8() throws Exception { - OOoBean bean1 = new OOoBean(); + OOoBean bean1 = new OOoBean(new PrivateLocalOfficeConnection(connection.getComponentContext())); BeanPanel bp1 = new BeanPanel(bean1); - OOoBean bean2 = new OOoBean(); + OOoBean bean2 = new OOoBean(new PrivateLocalOfficeConnection(connection.getComponentContext())); BeanPanel bp2 = new BeanPanel(bean2); - OOoBean bean3 = new OOoBean(); + OOoBean bean3 = new OOoBean(new PrivateLocalOfficeConnection(connection.getComponentContext())); BeanPanel bp3 = new BeanPanel(bean3); - OOoBean bean4 = new OOoBean(); + OOoBean bean4 = new OOoBean(new PrivateLocalOfficeConnection(connection.getComponentContext())); BeanPanel bp4 = new BeanPanel(bean4); try @@ -651,6 +707,31 @@ public class OOoBeanTest extends ComplexTestCase } } + + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + + } diff --git a/bean/qa/complex/ScreenComparer.java b/bean/qa/complex/bean/ScreenComparer.java index c169c45f4..d4796b964 100644 --- a/bean/qa/complex/ScreenComparer.java +++ b/bean/qa/complex/bean/ScreenComparer.java @@ -24,19 +24,19 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex; +package complex.bean; -import complexlib.ComplexTestCase; +// import complexlib.ComplexTestCase; import java.io.File; import java.awt.Rectangle; -import java.awt.BorderLayout; +// import java.awt.BorderLayout; import java.awt.image.BufferedImage; import java.awt.image.PixelGrabber; -import java.awt.event.*; -import java.awt.Frame; +// import java.awt.event.*; +// import java.awt.Frame; import javax.imageio.ImageIO; -import javax.imageio.stream.FileImageOutputStream; +// import javax.imageio.stream.FileImageOutputStream; @@ -104,7 +104,9 @@ class ScreenComparer public boolean compare() throws Exception { if (m_img1 == null || m_img2 == null) + { throw new Exception("Only one image captured!"); + } boolean ret = true; int w1 = m_img1.getWidth(); int h1 = m_img1.getHeight(); @@ -127,19 +129,31 @@ class ScreenComparer int pixel2 = 0; //get the pixel for m_img1 if (x < w1 && y < h1) + { pixel1 = m_img1.getRGB(x, y); + } else + { bOutOfRange = true; + } if (x < w2 && y < h2) + { pixel2 = m_img2.getRGB(x, y); + } else + { bOutOfRange = true; + } if (bOutOfRange || pixel1 != pixel2) + { m_imgDiff.setRGB(x, y, m_diffColor); + } else + { m_imgDiff.setRGB(x, y, pixel1); + } } } @@ -165,7 +179,9 @@ class ScreenComparer for (index = 0; index < lenAr; index++) { if (pixels1[index] != pixels2[index]) + { break; + } } //If the images are different, then create the diff image diff --git a/bean/qa/complex/WriterFrame.java b/bean/qa/complex/bean/WriterFrame.java index 370662929..711e74bf0 100644 --- a/bean/qa/complex/WriterFrame.java +++ b/bean/qa/complex/bean/WriterFrame.java @@ -24,67 +24,71 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -package complex; +package complex.bean; -import complexlib.ComplexTestCase; +// import com.sun.star.comp.beans.LocalOfficeConnection; +import com.sun.star.uno.XComponentContext; import java.awt.Rectangle; import java.awt.Insets; import java.awt.BorderLayout; -import java.awt.event.*; -import java.awt.Frame; -import java.awt.Dimension; import com.sun.star.comp.beans.OOoBean; import com.sun.star.uno.UnoRuntime; -import com.sun.star.text.XTextDocument; + class WriterFrame extends java.awt.Frame { com.sun.star.comp.beans.OOoBean m_bean; - String m_sDocURL = "private:factory/swriter"; + final static String m_sDocURL = "private:factory/swriter"; /** @param loadBeforeVisible the OOoBean is added to the frame before it is displayable. Then the Java Frame does not have a native window peer yet. */ - public WriterFrame(int x, int y, int width, int height, boolean loadBeforeVisible) throws Exception + public WriterFrame(int x, int y, int width, int height, boolean loadBeforeVisible, XComponentContext _xConn) throws Exception { - if (loadBeforeVisible == false) + try { - m_bean = new com.sun.star.comp.beans.OOoBean(); - add(m_bean, BorderLayout.CENTER); - pack(); - setBounds(x, y, width, height); - setVisible(true); - m_bean.loadFromURL(m_sDocURL, null); - validate(); + if (loadBeforeVisible == false) + { + m_bean = new com.sun.star.comp.beans.OOoBean(new PrivateLocalOfficeConnection(_xConn)); + add(m_bean, BorderLayout.CENTER); + pack(); + setBounds(x, y, width, height); + setVisible(true); + m_bean.loadFromURL(m_sDocURL, null); + validate(); + } + else + { + m_bean = new com.sun.star.comp.beans.OOoBean(new PrivateLocalOfficeConnection(_xConn)); + m_bean.loadFromURL(m_sDocURL, null); + add(m_bean, BorderLayout.CENTER); + pack(); + setBounds(x, y, width, height); + setVisible(true); + m_bean.aquireSystemWindow(); + } } - else + catch (Exception e) { - m_bean = new com.sun.star.comp.beans.OOoBean(); - m_bean.loadFromURL(m_sDocURL, null); - add(m_bean, BorderLayout.CENTER); - pack(); - setBounds(x, y, width, height); - setVisible(true); - m_bean.aquireSystemWindow(); + System.out.println("Exception caught: " + e.getMessage()); } } public WriterFrame() throws Exception { - this(0, 0, 800, 400, false); + this(0, 0, 800, 400, false, null); } public void setText(String s) throws Exception { com.sun.star.frame.XModel model = (com.sun.star.frame.XModel)m_bean.getDocument(); com.sun.star.text.XTextDocument myDoc = - (XTextDocument) UnoRuntime.queryInterface(com.sun.star.text.XTextDocument.class, - model); + UnoRuntime.queryInterface(com.sun.star.text.XTextDocument.class, model); com.sun.star.text.XText xText = myDoc.getText(); com.sun.star.text.XTextCursor xTCursor = xText.createTextCursor(); //inserting some Text @@ -95,12 +99,12 @@ class WriterFrame extends java.awt.Frame { com.sun.star.frame.XModel model = (com.sun.star.frame.XModel)m_bean.getDocument(); com.sun.star.text.XTextDocument myDoc = - (XTextDocument) UnoRuntime.queryInterface(com.sun.star.text.XTextDocument.class, - model); + UnoRuntime.queryInterface(com.sun.star.text.XTextDocument.class, model); com.sun.star.text.XText xText = myDoc.getText(); return xText.getString(); } + @Override public void dispose() { m_bean.stopOOoConnection(); setVisible(false); @@ -121,8 +125,7 @@ class WriterFrame extends java.awt.Frame com.sun.star.frame.XController xController = xModel.getCurrentController(); com.sun.star.text.XTextViewCursorSupplier xVCSupplier = - (com.sun.star.text.XTextViewCursorSupplier) UnoRuntime.queryInterface ( - com.sun.star.text.XTextViewCursorSupplier.class, xController ); + UnoRuntime.queryInterface(com.sun.star.text.XTextViewCursorSupplier.class, xController); com.sun.star.text.XTextViewCursor xTViewCursor = xVCSupplier.getViewCursor ( ); xTViewCursor.gotoStart(false); @@ -135,12 +138,10 @@ class WriterFrame extends java.awt.Frame com.sun.star.frame.XController xController = xModel.getCurrentController(); com.sun.star.text.XTextViewCursorSupplier xVCSupplier = - (com.sun.star.text.XTextViewCursorSupplier) UnoRuntime.queryInterface ( - com.sun.star.text.XTextViewCursorSupplier.class, xController ); + UnoRuntime.queryInterface(com.sun.star.text.XTextViewCursorSupplier.class, xController); com.sun.star.text.XTextViewCursor xTViewCursor = xVCSupplier.getViewCursor ( ); com.sun.star.view.XScreenCursor xScreenCursor = - (com.sun.star.view.XScreenCursor) UnoRuntime.queryInterface ( - com.sun.star.view.XScreenCursor.class, xTViewCursor ); + UnoRuntime.queryInterface(com.sun.star.view.XScreenCursor.class, xTViewCursor); xScreenCursor.screenDown(); } diff --git a/bean/qa/complex/bean/makefile.mk b/bean/qa/complex/bean/makefile.mk new file mode 100644 index 000000000..9a21e52ac --- /dev/null +++ b/bean/qa/complex/bean/makefile.mk @@ -0,0 +1,134 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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 +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE + +PRJ = ../../.. +PRJNAME = bean +TARGET = qa_complex_bean + +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/bean + +# here store only Files which contain a @Test +JAVATESTFILES = \ + OOoBeanTest.java + +# put here all other files +JAVAFILES = $(JAVATESTFILES) \ + ScreenComparer.java \ + WriterFrame.java + +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar officebean.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) + +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y + +.END + +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk + +ALLTAR : javatest + +.END + +# +# +# +# +# PRJ := ..$/.. +# PRJNAME := bean +# TARGET := test_bean +# PACKAGE = complex +# +# .INCLUDE: settings.mk +# +# #----- compile .java files ----------------------------------------- +# +# JARFILES = officebean.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar +# JAVAFILES = OOoBeanTest.java ScreenComparer.java WriterFrame.java +# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +# +# #----- make a jar from compiled files ------------------------------ +# +# MAXLINELENGTH = 100000 +# +# JARCLASSDIRS = $(PACKAGE) +# JARTARGET = $(TARGET).jar +# JARCOMPRESS = TRUE +# +# # --- Parameters for the test -------------------------------------- +# +# # test base is java complex +# CT_TESTBASE = -TestBase java_complex +# +# # test looks something like the.full.package.TestName +# CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +# +# # start the runner application +# CT_APP = org.openoffice.Runner +# +# CT_NOOFFICE = -NoOffice +# +# +# OFFICE_CLASSPATH_TMP:=$(foreach,i,$(JARFILES) $(office)$/program$/classes$/$(i)$(PATH_SEPERATOR)) +# +# OFFICE_CLASSPATH=$(OFFICE_CLASSPATH_TMP:t"")$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPERATOR)$(CLASSDIR) +# +# OOOBEAN_OPTIONS=-Dcom.sun.star.officebean.Options=-norestore -DOOoBean.Images=$(MISC) +# +# +# .INCLUDE: target.mk +# +# ALLTAR : RUNINSTRUCTIONS +# +# # --- Targets ------------------------------------------------------ +# +# #The OOoBean uses the classpath to find the office installation. +# #Therefore we must use the jar files from the office. +# RUN: +# java -cp $(OFFICE_CLASSPATH) $(OOOBEAN_OPTIONS) $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST) +# run: RUN +# +# rund: +# java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8100 -cp $(OFFICE_CLASSPATH) $(OOOBEAN_OPTIONS) $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST) +# +# +# +# RUNINSTRUCTIONS : +# @echo . +# @echo ########################### N O T E ###################################### +# @echo . +# @echo "To run the test you have to provide the office location." +# @echo Example: +# @echo dmake run office="d:/myOffice" +# @echo . +# diff --git a/bean/qa/complex/makefile.mk b/bean/qa/complex/makefile.mk deleted file mode 100644 index e7b88ce34..000000000 --- a/bean/qa/complex/makefile.mk +++ /dev/null @@ -1,95 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ := ..$/.. -PRJNAME := bean -TARGET := test_bean -PACKAGE = complex - -.INCLUDE: settings.mk - -#----- compile .java files ----------------------------------------- - -JARFILES = officebean.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = OOoBeanTest.java ScreenComparer.java WriterFrame.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - -# --- Parameters for the test -------------------------------------- - -# test base is java complex -CT_TESTBASE = -TestBase java_complex - -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) - -# start the runner application -CT_APP = org.openoffice.Runner - -CT_NOOFFICE = -NoOffice - - -OFFICE_CLASSPATH_TMP:=$(foreach,i,$(JARFILES) $(office)$/program$/classes$/$(i)$(PATH_SEPERATOR)) - -OFFICE_CLASSPATH=$(OFFICE_CLASSPATH_TMP:t"")$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPERATOR)$(CLASSDIR) - -OOOBEAN_OPTIONS=-Dcom.sun.star.officebean.Options=-norestore -DOOoBean.Images=$(MISC) - - -.INCLUDE: target.mk - -ALLTAR : RUNINSTRUCTIONS - -# --- Targets ------------------------------------------------------ - -#The OOoBean uses the classpath to find the office installation. -#Therefore we must use the jar files from the office. -RUN: - java -cp $(OFFICE_CLASSPATH) $(OOOBEAN_OPTIONS) $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST) -run: RUN - -rund: - java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8100 -cp $(OFFICE_CLASSPATH) $(OOOBEAN_OPTIONS) $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST) - - - -RUNINSTRUCTIONS : - @echo . - @echo ########################### N O T E ###################################### - @echo . - @echo "To run the test you have to provide the office location." - @echo Example: - @echo dmake run office="d:/myOffice" - @echo . - diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx index 2467735c4..7c6faf4f3 100755 --- a/crashrep/source/unx/main.cxx +++ b/crashrep/source/unx/main.cxx @@ -129,12 +129,12 @@ static string trim_string( const string& rString ) { string temp = rString; - while ( temp.length() && temp[0] == ' ' || temp[0] == '\t' ) + while ( temp.length() && (temp[0] == ' ' || temp[0] == '\t') ) temp.erase( 0, 1 ); string::size_type len = temp.length(); - while ( len && temp[len-1] == ' ' || temp[len-1] == '\t' ) + while ( len && (temp[len-1] == ' ' || temp[len-1] == '\t') ) { temp.erase( len - 1, 1 ); len = temp.length(); diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 4e0a71afb..923c91506 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -804,7 +804,6 @@ #include "svtools/parhtml.hxx" #include "svtools/parrtf.hxx" #include "unotools/pathoptions.hxx" -#include "svl/pickerhelper.hxx" #include "svl/poolitem.hxx" #include "unotools/printwarningoptions.hxx" #include "svl/ptitem.hxx" diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index dd8194be6..e0b0873ce 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1368,133 +1368,6 @@ IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, EMPTYARG return 0; } -::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) -{ - ::rtl::OUString aLabel; - if ( aCmdURL.getLength() ) - { - try - { - uno::Reference< container::XNameAccess > xNameAccess( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.frame.UICommandDescription") ), uno::UNO_QUERY ); - if ( xNameAccess.is() ) - { - uno::Reference< container::XNameAccess > xUICommandLabels; - const ::rtl::OUString aModule( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ) ); - uno::Any a = xNameAccess->getByName( aModule ); - uno::Reference< container::XNameAccess > xUICommands; - a >>= xUICommandLabels; - rtl::OUString aStr; - uno::Sequence< beans::PropertyValue > aPropSeq; - a = xUICommandLabels->getByName( aCmdURL ); - if ( a >>= aPropSeq ) - { - for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ ) - { - if ( aPropSeq[i].Name.equalsAscii( "Name" )) - { - aPropSeq[i].Value >>= aStr; - break; - } - } - } - aLabel = aStr; - } - } - catch ( uno::Exception& ) - { - } - } - - return aLabel; -} - - -//----------------------------------------------- -String SfxAcceleratorConfigPage::GetFunctionName(KeyFuncType eType) const -{ - ::rtl::OUStringBuffer sName(256); - sName.appendAscii("\""); - switch(eType) - { - case KEYFUNC_NEW : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:NewDoc") ) ); - break; - - case KEYFUNC_OPEN : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Open") ) ); - break; - - case KEYFUNC_SAVE : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Save") ) ); - break; - - case KEYFUNC_SAVEAS : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:SaveAs") ) ); - break; - - case KEYFUNC_PRINT : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Print") ) ); - break; - - case KEYFUNC_CLOSE : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Close") ) ); - break; - - case KEYFUNC_QUIT : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Quit") ) ); - break; - - case KEYFUNC_CUT : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Cut") ) ); - break; - - case KEYFUNC_COPY : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Copy") ) ); - break; - - case KEYFUNC_PASTE : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Paste") ) ); - break; - - case KEYFUNC_UNDO : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Undo") ) ); - break; - - case KEYFUNC_REDO : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Redo") ) ); - break; - - case KEYFUNC_DELETE : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Delete") ) ); - break; - - case KEYFUNC_REPEAT : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Repeat") ) ); - break; - - case KEYFUNC_FIND : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Search") ) ); - break; - - case KEYFUNC_FINDBACKWARD : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:SearchBackwards") ) ); - break; - - case KEYFUNC_PROPERTIES : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Options") ) ); - break; - - case KEYFUNC_FRONT : - sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:ToFront") ) ); - break; - - default: - break; - } - sName.appendAscii("\""); - return String(sName.makeStringAndClear()); -} - //----------------------------------------------- void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTitle ) { @@ -1506,7 +1379,6 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTi m_pFileDlg = new sfx2::FileDialogHelper( nDialogType, 0 ); m_pFileDlg->SetTitle( rTitle ); -// m_pFileDlg->SetDialogHelpId( bSave ? HID_CONFIG_SAVE : HID_CONFIG_LOAD ); m_pFileDlg->AddFilter( aFilterAllStr, DEFINE_CONST_UNICODE( FILEDIALOG_FILTER_ALL ) ); m_pFileDlg->AddFilter( aFilterCfgStr, DEFINE_CONST_UNICODE( "*.cfg" ) ); @@ -1577,37 +1449,6 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet ) } //----------------------------------------------- -void SfxAcceleratorConfigPage::SelectMacro(const SfxMacroInfoItem *pItem) -{ - m_pMacroInfoItem = pItem; - pGroupLBox->SelectMacro( pItem ); -} - -//----------------------------------------------- -void SfxAcceleratorConfigPage::CopySource2Target(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xSourceAccMgr, - const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xTargetAccMgr) -{ - const css::uno::Sequence< css::awt::KeyEvent > lKeys = xSourceAccMgr->getAllKeyEvents(); - sal_Int32 c = lKeys.getLength(); - sal_Int32 i = 0; - for (i=0; i<c; ++i) - { - const css::awt::KeyEvent& rKey = lKeys[i]; - ::rtl::OUString sCommand = xSourceAccMgr->getCommandByKeyEvent(rKey); - xTargetAccMgr->setKeyEvent(rKey, sCommand); - } -} - -//----------------------------------------------- -KeyCode SfxAcceleratorConfigPage::MapPosToKeyCode(USHORT nPos) const -{ - TAccInfo* pEntry = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData(); - KeyCode aCode(KEYCODE_ARRAY[pEntry->m_nKeyPos] & 0xFFF , - KEYCODE_ARRAY[pEntry->m_nKeyPos] & (KEY_SHIFT | KEY_MOD2)); - return aCode; -} - -//----------------------------------------------- USHORT SfxAcceleratorConfigPage::MapKeyCodeToPos(const KeyCode& aKey) const { USHORT nCode1 = aKey.GetCode()+aKey.GetModifier(); diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src index ee4dc0da1..c585377b2 100644 --- a/cui/source/customize/acccfg.src +++ b/cui/source/customize/acccfg.src @@ -67,18 +67,21 @@ TabPage RID_SVXPAGE_KEYBOARD Size = MAP_APPFONT ( 273 , 258 ) ; RadioButton RB_OFFICE { + HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE"; Pos = MAP_APPFONT ( 192 , 6 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; Text = "%PRODUCTNAME" ; }; RadioButton RB_MODULE { + HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE"; Pos = MAP_APPFONT ( 192 , 19 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; Text = "$(MODULE)" ; }; PushButton BTN_ACC_CHANGE { + HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE"; Pos = MAP_APPFONT ( 192 , 35 ) ; Size = MAP_APPFONT ( 75 , 14 ) ; TabStop = TRUE ; @@ -86,6 +89,7 @@ TabPage RID_SVXPAGE_KEYBOARD }; PushButton BTN_ACC_REMOVE { + HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE"; Pos = MAP_APPFONT ( 192 , 52 ) ; Size = MAP_APPFONT ( 75 , 14 ) ; TabStop = TRUE ; @@ -162,6 +166,7 @@ TabPage RID_SVXPAGE_KEYBOARD }; PushButton BTN_LOAD { + HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD"; Pos = MAP_APPFONT ( 192 , 86 ) ; Size = MAP_APPFONT ( 75 , 14 ) ; TabStop = TRUE ; @@ -170,6 +175,7 @@ TabPage RID_SVXPAGE_KEYBOARD }; PushButton BTN_SAVE { + HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE"; Pos = MAP_APPFONT ( 192 , 103 ) ; Size = MAP_APPFONT ( 75 , 14 ) ; TabStop = TRUE ; @@ -178,6 +184,7 @@ TabPage RID_SVXPAGE_KEYBOARD }; PushButton BTN_RESET { + HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET"; Pos = MAP_APPFONT ( 192 , 120 ) ; Size = MAP_APPFONT ( 75 , 14 ) ; TabStop = TRUE ; diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 211deeffb..a92375e74 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -112,7 +112,6 @@ #define ENTRY_HEIGHT 16 static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; -static const char ITEM_DESCRIPTOR_HELPURL[] = "HelpURL"; static const char ITEM_DESCRIPTOR_CONTAINER[] = "ItemDescriptorContainer"; static const char ITEM_DESCRIPTOR_LABEL[] = "Label"; static const char ITEM_DESCRIPTOR_TYPE[] = "Type"; @@ -144,6 +143,8 @@ namespace container = com::sun::star::container; namespace beans = com::sun::star::beans; namespace graphic = com::sun::star::graphic; +#if OSL_DEBUG_LEVEL > 1 + void printPropertySet( const OUString& prefix, const uno::Reference< beans::XPropertySet >& xPropSet ) @@ -208,6 +209,8 @@ void printEntries(SvxEntries* entries) } } +#endif + OUString stripHotKey( const OUString& str ) { @@ -518,7 +521,6 @@ bool GetMenuItemData( const uno::Reference< container::XIndexAccess >& rItemContainer, sal_Int32 nIndex, OUString& rCommandURL, - OUString& rHelpURL, OUString& rLabel, sal_uInt16& rType, uno::Reference< container::XIndexAccess >& rSubMenu ) @@ -534,10 +536,6 @@ bool GetMenuItemData( { aProp[i].Value >>= rCommandURL; } - else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL )) - { - aProp[i].Value >>= rHelpURL; - } else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_CONTAINER )) { aProp[i].Value >>= rSubMenu; @@ -566,7 +564,6 @@ bool GetToolbarItemData( const uno::Reference< container::XIndexAccess >& rItemContainer, sal_Int32 nIndex, OUString& rCommandURL, - OUString& rHelpURL, OUString& rLabel, sal_uInt16& rType, sal_Bool& rIsVisible, @@ -588,10 +585,6 @@ bool GetToolbarItemData( { aProp[i].Value >>= rStyle; } - else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL )) - { - aProp[i].Value >>= rHelpURL; - } else if (aProp[i].Name.equalsAscii(ITEM_DESCRIPTOR_CONTAINER)) { aProp[i].Value >>= rSubMenu; @@ -634,13 +627,10 @@ ConvertSvxConfigEntry( static const OUString aDescriptorLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) ); - static const OUString aDescriptorHelpURL( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ) ); - static const OUString aDescriptorContainer( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER ) ); - uno::Sequence< beans::PropertyValue > aPropSeq( 4 ); + uno::Sequence< beans::PropertyValue > aPropSeq( 3 ); aPropSeq[0].Name = aDescriptorCommandURL; aPropSeq[0].Value <<= rtl::OUString( pEntry->GetCommand() ); @@ -698,9 +688,6 @@ ConvertSvxConfigEntry( aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() ); } - aPropSeq[3].Name = aDescriptorHelpURL; - aPropSeq[3].Value <<= rtl::OUString( pEntry->GetHelpURL() ); - return aPropSeq; } @@ -718,16 +705,13 @@ ConvertToolbarEntry( static const OUString aDescriptorLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) ); - static const OUString aDescriptorHelpURL( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ) ); - static const OUString aDescriptorContainer( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER ) ); static const OUString aIsVisible( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_ISVISIBLE ) ); - uno::Sequence< beans::PropertyValue > aPropSeq( 5 ); + uno::Sequence< beans::PropertyValue > aPropSeq( 4 ); aPropSeq[0].Name = aDescriptorCommandURL; aPropSeq[0].Value <<= rtl::OUString( pEntry->GetCommand() ); @@ -785,11 +769,8 @@ ConvertToolbarEntry( aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() ); } - aPropSeq[3].Name = aDescriptorHelpURL; - aPropSeq[3].Value <<= rtl::OUString( pEntry->GetHelpURL() ); - - aPropSeq[4].Name = aIsVisible; - aPropSeq[4].Value <<= pEntry->IsVisible(); + aPropSeq[3].Name = aIsVisible; + aPropSeq[3].Value <<= pEntry->IsVisible(); return aPropSeq; } @@ -918,11 +899,6 @@ void SvxConfigDialog::PageCreated( USHORT nId, SfxTabPage& rPage ) } } -void SvxConfigDialog::ActivateTabPage( USHORT nSlotId ) -{ - (void)nSlotId; -} - /****************************************************************************** * * The SaveInData class is used to hold data for entries in the Save In @@ -1177,20 +1153,23 @@ bool MenuSaveInData::LoadSubMenus( const OUString& rBaseTitle, SvxConfigEntry* pParentData ) { - SvxEntries* pEntries = pParentData->GetEntries(); + SvxEntries* pEntries = pParentData->GetEntries(); + // Don't access non existing menu configuration! + if ( !xMenuSettings.is() ) + return true; + for ( sal_Int32 nIndex = 0; nIndex < xMenuSettings->getCount(); nIndex++ ) { uno::Reference< container::XIndexAccess > xSubMenu; OUString aCommandURL; - OUString aHelpURL; OUString aLabel; bool bIsUserDefined = TRUE; sal_uInt16 nType( css::ui::ItemType::DEFAULT ); bool bItem = GetMenuItemData( xMenuSettings, nIndex, - aCommandURL, aHelpURL, aLabel, nType, xSubMenu ); + aCommandURL, aLabel, nType, xSubMenu ); if ( bItem ) { @@ -1232,7 +1211,6 @@ bool MenuSaveInData::LoadSubMenus( aLabel, aCommandURL, TRUE ); pEntry->SetUserDefined( bIsUserDefined ); - pEntry->SetHelpURL( aHelpURL ); pEntries->push_back( pEntry ); @@ -1257,7 +1235,6 @@ bool MenuSaveInData::LoadSubMenus( SvxConfigEntry* pEntry = new SvxConfigEntry( aLabel, aCommandURL, FALSE ); pEntry->SetUserDefined( bIsUserDefined ); - pEntry->SetHelpURL( aHelpURL ); pEntries->push_back( pEntry ); } } @@ -2154,7 +2131,6 @@ SvLBoxEntry* SvxConfigPage::AddFunction( SvxConfigEntry* pNewEntryData = new SvxConfigEntry( aDisplayName, aURL, FALSE ); pNewEntryData->SetUserDefined( TRUE ); - pNewEntryData->SetHelpURL( aURL ); // check that this function is not already in the menu SvxConfigEntry* pParent = GetTopLevelSelection(); @@ -2594,17 +2570,20 @@ IMPL_LINK( SvxMenuConfigPage, SelectMenu, ListBox *, pBox ) SvxConfigEntry* pMenuData = GetTopLevelSelection(); PopupMenu* pPopup = aModifyTopLevelButton.GetPopupMenu(); - pPopup->EnableItem( ID_DELETE, pMenuData->IsDeletable() ); - pPopup->EnableItem( ID_RENAME, pMenuData->IsRenamable() ); - pPopup->EnableItem( ID_MOVE, pMenuData->IsMovable() ); + if ( pMenuData ) + { + pPopup->EnableItem( ID_DELETE, pMenuData->IsDeletable() ); + pPopup->EnableItem( ID_RENAME, pMenuData->IsRenamable() ); + pPopup->EnableItem( ID_MOVE, pMenuData->IsMovable() ); - SvxEntries* pEntries = pMenuData->GetEntries(); - SvxEntries::const_iterator iter = pEntries->begin(); + SvxEntries* pEntries = pMenuData->GetEntries(); + SvxEntries::const_iterator iter = pEntries->begin(); - for ( ; iter != pEntries->end(); iter++ ) - { - SvxConfigEntry* pEntry = *iter; - InsertEntryIntoUI( pEntry ); + for ( ; iter != pEntries->end(); iter++ ) + { + SvxConfigEntry* pEntry = *iter; + InsertEntryIntoUI( pEntry ); + } } UpdateButtonStates(); @@ -3055,228 +3034,20 @@ SvxConfigEntry* SvxMainMenuOrganizerDialog::GetSelectedEntry() return (SvxConfigEntry*)aMenuListBox.FirstSelected()->GetUserData(); } -SvxConfigEntry::SvxConfigEntry( - const uno::Sequence< beans::PropertyValue >& rProperties, - const uno::Reference< container::XNameAccess >& rCommandToLabelMap ) - : - nId( 1 ), - bPopUp( FALSE ), - bStrEdited( FALSE ), - bIsUserDefined( FALSE ), - bIsMain( FALSE ), - bIsParentData( FALSE ), - bIsVisible( TRUE ), - nStyle( 0 ), - pEntries( 0 ) -{ - sal_uInt16 nType( css::ui::ItemType::DEFAULT ); - OUString aHelpURL_; - - for ( sal_Int32 i = 0; i < rProperties.getLength(); i++ ) - { - if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL )) - { - rProperties[i].Value >>= aCommand; - } - else if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL )) - { - rProperties[i].Value >>= aHelpURL_; - } - else if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL )) - { - rProperties[i].Value >>= aLabel; - } - else if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_TYPE )) - { - rProperties[i].Value >>= nType; - } - } - - if ( nType == css::ui::ItemType::DEFAULT ) - { - uno::Any a; - try - { - a = rCommandToLabelMap->getByName( aCommand ); - bIsUserDefined = FALSE; - } - catch ( container::NoSuchElementException& ) - { - bIsUserDefined = TRUE; - } - - // If custom label not set retrieve it from the command to info service - if ( aLabel.equals( OUString() ) ) - { - uno::Sequence< beans::PropertyValue > aPropSeq; - if ( a >>= aPropSeq ) - { - for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ ) - { - if ( aPropSeq[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL ) ) - { - aPropSeq[i].Value >>= aLabel; - break; - } - } - } - } - } -} - const OUString& SvxConfigEntry::GetHelpText() { if ( aHelpText.getLength() == 0 ) { - OUString helpid = OUString::createFromAscii( "helpid:" ); - if ( aHelpURL.indexOf( helpid ) != -1 ) - { - aHelpURL = aHelpURL.copy( helpid.getLength() ); - } - - Help* pHelp = Application::GetHelp(); - if ( aHelpURL.toInt32() != 0 ) - { - aHelpText = pHelp->GetHelpText( aHelpURL.toInt32(), NULL ); - } - - if ( aHelpText.getLength() == 0 && aCommand.getLength() != 0 ) + if ( aCommand.getLength() ) { - aHelpText = pHelp->GetHelpText( aCommand, NULL ); + aHelpText = Application::GetHelp()->GetHelpText( aCommand, NULL ); } } return aHelpText; } -uno::Sequence< beans::PropertyValue > -SvxConfigEntry::GetProperties( - const uno::Reference< container::XNameAccess >& rCommandToLabelMap ) -{ - if ( IsSeparator() ) - { - uno::Sequence< beans::PropertyValue > aPropSeq( 1 ); - - aPropSeq[0].Name = OUString( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE ) ); - aPropSeq[0].Value <<= css::ui::ItemType::SEPARATOR_LINE; - - return aPropSeq; - } - - static const OUString aDescriptorCommandURL ( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL ) ); - - static const OUString aDescriptorType( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE ) ); - - static const OUString aDescriptorLabel( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) ); - - static const OUString aDescriptorHelpURL( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ) ); - - uno::Sequence< beans::PropertyValue > aPropSeq( 4 ); - - aPropSeq[0].Name = aDescriptorCommandURL; - aPropSeq[0].Value <<= rtl::OUString( GetCommand() ); - - aPropSeq[1].Name = aDescriptorType; - aPropSeq[1].Value <<= css::ui::ItemType::DEFAULT; - - // If the name has not been changed and the name is the same as - // in the default command to label map then the label can be stored - // as an empty string. - // It will be initialised again later using the command to label map. - aPropSeq[2].Name = aDescriptorLabel; - if ( HasChangedName() == FALSE && GetCommand().getLength() ) - { - BOOL isDefaultName = FALSE; - try - { - uno::Any a( rCommandToLabelMap->getByName( GetCommand() ) ); - uno::Sequence< beans::PropertyValue > tmpPropSeq; - if ( a >>= tmpPropSeq ) - { - for ( sal_Int32 i = 0; i < tmpPropSeq.getLength(); i++ ) - { - if ( tmpPropSeq[i].Name.equals( aDescriptorLabel ) ) - { - OUString tmpLabel; - tmpPropSeq[i].Value >>= tmpLabel; - - if ( tmpLabel.equals( GetName() ) ) - { - isDefaultName = TRUE; - } - - break; - } - } - } - } - catch ( container::NoSuchElementException& ) - { - // isDefaultName is left as FALSE - } - - if ( isDefaultName ) - { - aPropSeq[2].Value <<= rtl::OUString(); - } - else - { - aPropSeq[2].Value <<= rtl::OUString( GetName() ); - } - } - else - { - aPropSeq[2].Value <<= rtl::OUString( GetName() ); - } - - aPropSeq[3].Name = aDescriptorHelpURL; - aPropSeq[3].Value <<= rtl::OUString( GetHelpURL() ); - - return aPropSeq; -} - -/* -SvxMenuConfigEntry::SvxMenuConfigEntry( - const uno::Sequence< beans::PropertyValue >& rProperties, - const uno::Reference< container::XNameAccess >& rCommandToLabelMap ) - : - SvxConfigEntry( rProperties, rCommandToLabelMap ) -{ - uno::Reference< container::XIndexAccess > aChildren; - - for ( sal_Int32 i = 0; i < rProperties.getLength(); i++ ) - { - if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_CONTAINER )) - { - rProperties[i].Value >>= aChildren; - } - } - - if ( aChildren.is() ) - { - SetPopup( TRUE ); - SetEntries( new SvxEntries() ); - - uno::Sequence< beans::PropertyValue > aProps; - for ( sal_Int32 i = 0; i < aChildren->getCount(); i++ ) - { - if ( aChildren->getByIndex( i ) >>= aProps ) - { - SvxConfigEntry* pEntry = - new SvxMenuConfigEntry( aProps, rCommandToLabelMap ); - GetEntries()->push_back( pEntry ); - } - } - } -} -*/ - SvxConfigEntry::SvxConfigEntry( const OUString& rDisplayName, const OUString& rCommandURL, bool bPopup, bool bParentData ) : nId( 1 ) @@ -4695,51 +4466,6 @@ void ToolbarSaveInData::RestoreToolbar( SvxConfigEntry* pToolbar ) } } -void ToolbarSaveInData::ReloadToolbar( const OUString& rResourceURL ) -{ - SvxEntries::const_iterator iter = GetEntries()->begin(); - SvxConfigEntry* pToolbar = NULL; - - for ( ; iter != GetEntries()->end(); iter++ ) - { - SvxConfigEntry* pEntry = *iter; - - if ( pEntry->GetCommand().equals( rResourceURL ) ) - { - pToolbar = pEntry; - break; - } - } - - if ( pToolbar != NULL ) - { - delete pToolbar->GetEntries(); - - try - { - uno::Reference< container::XIndexAccess > xToolbarSettings; - - if ( pToolbar->IsParentData() ) - { - xToolbarSettings = GetParentConfigManager()->getSettings( - pToolbar->GetCommand(), sal_False); - } - else - { - xToolbarSettings = GetConfigManager()->getSettings( - pToolbar->GetCommand(), sal_False); - } - - LoadToolbar( xToolbarSettings, pToolbar ); - } - catch ( container::NoSuchElementException& ) - { - // toolbar not found for some reason - // it will not appear in the toolbar list - } - } -} - bool ToolbarSaveInData::LoadToolbar( const uno::Reference< container::XIndexAccess >& xToolbarSettings, SvxConfigEntry* pParentData ) @@ -4750,7 +4476,6 @@ bool ToolbarSaveInData::LoadToolbar( { uno::Reference< container::XIndexAccess > xSubMenu; OUString aCommandURL; - OUString aHelpURL; OUString aLabel; bool bIsUserDefined = TRUE; sal_Bool bIsVisible; @@ -4759,7 +4484,7 @@ bool ToolbarSaveInData::LoadToolbar( sal_uInt16 nType( css::ui::ItemType::DEFAULT ); bool bItem = GetToolbarItemData( xToolbarSettings, nIndex, aCommandURL, - aHelpURL, aLabel, nType, bIsVisible, nStyle, xSubMenu ); + aLabel, nType, bIsVisible, nStyle, xSubMenu ); if ( bItem ) { @@ -4800,7 +4525,6 @@ bool ToolbarSaveInData::LoadToolbar( aLabel, aCommandURL, TRUE ); pEntry->SetUserDefined( bIsUserDefined ); - pEntry->SetHelpURL( aHelpURL ); pEntry->SetVisible( bIsVisible ); pEntries->push_back( pEntry ); @@ -4812,7 +4536,6 @@ bool ToolbarSaveInData::LoadToolbar( SvxConfigEntry* pEntry = new SvxConfigEntry( aLabel, aCommandURL, FALSE ); pEntry->SetUserDefined( bIsUserDefined ); - pEntry->SetHelpURL( aHelpURL ); pEntry->SetVisible( bIsVisible ); pEntry->SetStyle( nStyle ); pEntries->push_back( pEntry ); diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src index c6d7f7ab1..7302a0f89 100644 --- a/cui/source/customize/cfg.src +++ b/cui/source/customize/cfg.src @@ -136,6 +136,7 @@ TabPage RID_SVXPAGE_MENUS }; ListBox LB_MENUS { + HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS"; Border = TRUE ; Pos = MAP_APPFONT ( 64 , 22 ) ; Size = MAP_APPFONT ( 108 , 108 ) ; @@ -143,6 +144,7 @@ TabPage RID_SVXPAGE_MENUS }; PushButton BTN_NEW { + HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_NEW"; Pos = MAP_APPFONT ( 192 , 22 ) ; Size = MAP_APPFONT ( 75 , 14 ) ; TabStop = TRUE ; @@ -151,6 +153,7 @@ TabPage RID_SVXPAGE_MENUS }; MenuButton BTN_CHANGE { + HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE"; Pos = MAP_APPFONT ( 192 , 39 ) ; Size = MAP_APPFONT ( 75 , 14 ) ; TabStop = TRUE ; @@ -181,6 +184,7 @@ TabPage RID_SVXPAGE_MENUS }; PushButton BTN_ADD_COMMANDS { + HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS"; Pos = MAP_APPFONT ( 192 , 67 ) ; Size = MAP_APPFONT ( 75 , 14 ) ; TabStop = TRUE ; @@ -189,6 +193,7 @@ TabPage RID_SVXPAGE_MENUS }; MenuButton BTN_CHANGE_ENTRY { + HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY"; Pos = MAP_APPFONT ( 192 , 84 ) ; Size = MAP_APPFONT ( 75 , 14 ) ; TabStop = TRUE ; @@ -197,6 +202,7 @@ TabPage RID_SVXPAGE_MENUS }; ImageButton BTN_UP { + HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP"; Pos = MAP_APPFONT ( 175 , 102 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE ; @@ -205,6 +211,7 @@ TabPage RID_SVXPAGE_MENUS }; ImageButton BTN_DOWN { + HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN"; Pos = MAP_APPFONT ( 175 , 119 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE ; @@ -220,6 +227,7 @@ TabPage RID_SVXPAGE_MENUS }; ListBox LB_SAVEIN { + HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN"; Border = TRUE ; Pos = MAP_APPFONT ( 64 , 188 ) ; Size = MAP_APPFONT ( 108 , 53 ) ; @@ -234,6 +242,7 @@ TabPage RID_SVXPAGE_MENUS }; MultiLineEdit ED_DESCRIPTION { + HelpID = "cui:MultiLineEdit:RID_SVXPAGE_MENUS:ED_DESCRIPTION"; Pos = MAP_APPFONT ( 6 , 216 ) ; Size = MAP_APPFONT ( 261 , 36 ) ; Border = TRUE; @@ -493,6 +502,7 @@ ModalDialog MD_MENU_ORGANISER }; Edit EDIT_MENU_NAME { + HelpID = "cui:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 19 ) ; Size = MAP_APPFONT ( 93 , 12 ) ; @@ -517,6 +527,7 @@ ModalDialog MD_MENU_ORGANISER }; ImageButton BTN_MENU_UP { + HelpID = "cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP"; Pos = MAP_APPFONT ( 102 , 80 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE ; @@ -524,6 +535,7 @@ ModalDialog MD_MENU_ORGANISER }; ImageButton BTN_MENU_DOWN { + HelpID = "cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN"; Pos = MAP_APPFONT ( 102 , 97 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE ; @@ -550,6 +562,7 @@ ModalDialog MD_MENU_ORGANISER // MD_NEW_TOOLBAR ------------------------------------------------- ModalDialog MD_NEW_TOOLBAR { + HelpID = "cui:ModalDialog:MD_NEW_TOOLBAR"; OutputSize = TRUE ; SvLook = TRUE ; Size = MAP_APPFONT ( 165 , 63 ) ; @@ -565,6 +578,7 @@ ModalDialog MD_NEW_TOOLBAR }; Edit EDT_STRING { + HelpID = "cui:Edit:MD_NEW_TOOLBAR:EDT_STRING"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 97 , 12 ) ; @@ -579,6 +593,7 @@ ModalDialog MD_NEW_TOOLBAR }; ListBox LB_SAVEIN { + HelpID = "cui:ListBox:MD_NEW_TOOLBAR:LB_SAVEIN"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 43 ) ; Size = MAP_APPFONT ( 97 , 53 ) ; @@ -654,6 +669,7 @@ ModalDialog MD_ICONSELECTOR }; PushButton BTN_IMPORT { + HelpID = "cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT"; Pos = MAP_APPFONT ( 184 , 7 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -662,6 +678,7 @@ ModalDialog MD_ICONSELECTOR }; PushButton BTN_DELETE { + HelpID = "cui:PushButton:MD_ICONSELECTOR:BTN_DELETE"; Pos = MAP_APPFONT ( 184 , 24 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -691,6 +708,7 @@ ModalDialog MD_ICONSELECTOR //added for issue83555 ModalDialog MD_ICONCHANGE { + HelpID = "cui:ModalDialog:MD_ICONCHANGE"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200 , 150 ) ; @@ -714,6 +732,7 @@ ModalDialog MD_ICONCHANGE MultiLineEdit EDT_ADDR { + HelpID = "cui:MultiLineEdit:MD_ICONCHANGE:EDT_ADDR"; Pos = MAP_APPFONT ( 30 , 38) ; Size = MAP_APPFONT ( 140 , 83 ) ; Border = TRUE; diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index dce62d51f..10b3f7a8b 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -376,40 +376,6 @@ void SfxConfigFunctionListBox_Impl::ClearAll() Clear(); } -SvLBoxEntry* SfxConfigFunctionListBox_Impl::GetEntry_Impl( const String& rName ) -/* Beschreibung - Ermittelt den SvLBoxEntry zu einem "ubergebenen String. Das setzt voraus, da\s - die Namen eindeutig sind. -*/ -{ - SvLBoxEntry *pEntry = First(); - while ( pEntry ) - { - if ( GetEntryText( pEntry ) == rName ) - return pEntry; - pEntry = Next( pEntry ); - } - - return NULL; -} - -SvLBoxEntry* SfxConfigFunctionListBox_Impl::GetEntry_Impl( USHORT nId ) -/* Beschreibung - Ermittelt den SvLBoxEntry zu einer "ubergebenen Id. -*/ -{ - SvLBoxEntry *pEntry = First(); - while ( pEntry ) - { - SfxGroupInfo_Impl *pData = (SfxGroupInfo_Impl*) pEntry->GetUserData(); - if ( pData && pData->nOrd == nId ) - return pEntry; - pEntry = Next( pEntry ); - } - - return NULL; -} - SfxMacroInfo* SfxConfigFunctionListBox_Impl::GetMacroInfo() /* Beschreibung Gibt die MacroInfo des selektierten Entry zur"uck ( sofern vorhanden ). @@ -451,60 +417,6 @@ String SfxConfigFunctionListBox_Impl::GetCurLabel() return pData->sCommand; } -USHORT SfxConfigFunctionListBox_Impl::GetId( SvLBoxEntry *pEntry ) -/* Beschreibung - Gibt die Ordnungsnummer ( SlotId oder Macro-Nummer ) des Eintrags zur"uck. -*/ -{ - SfxGroupInfo_Impl *pData = pEntry ? - (SfxGroupInfo_Impl*) pEntry->GetUserData() : 0; - if ( pData ) - return pData->nOrd; - return 0; -} - -/* -String SfxConfigFunctionListBox_Impl::GetHelpText( SvLBoxEntry *pEntry ) -{ - // Information zum selektierten Entry aus den Userdaten holen - SfxGroupInfo_Impl *pInfo = pEntry ? (SfxGroupInfo_Impl*) pEntry->GetUserData(): 0; - if ( pInfo ) - { - switch ( pInfo->nKind ) - { - case SFX_CFGGROUP_FUNCTION : - case SFX_CFGFUNCTION_SLOT : - { - // Eintrag ist eine Funktion, Hilfe aus der Office-Hilfe - USHORT nId = pInfo->nOrd; - String aText = Application::GetHelp()->GetHelpText( nId, this ); - - if ( !aText.Len() ) - aText = SFX_SLOTPOOL().GetSlotHelpText_Impl( nId ); - return aText; - } - - case SFX_CFGGROUP_SCRIPTCONTAINER : - case SFX_CFGFUNCTION_SCRIPT : - case SFX_CFGGROUP_BASICMGR : - case SFX_CFGGROUP_DOCBASICMGR : - case SFX_CFGGROUP_BASICLIB : - case SFX_CFGGROUP_BASICMOD : - case SFX_CFGFUNCTION_MACRO : - { - // Eintrag ist ein Macro, Hilfe aus der MacroInfo - SfxMacroInfo *pMacInfo = (SfxMacroInfo*) pInfo->pObject; - return pMacInfo->GetHelpText(); - } - - case SFX_CFGGROUP_STYLES : - return String(); - } - } - - return String(); -}*/ - void SfxConfigFunctionListBox_Impl::FunctionSelected() /* Beschreibung Setzt die Balloonhelp zur"uck, da diese immer den Helptext des selektierten @@ -1247,25 +1159,6 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC return xModel; } -::rtl::OUString SfxConfigGroupListBox_Impl::parseLocationName( const ::rtl::OUString& location ) -{ - // strip out the last leaf of location name - // e.g. file://dir1/dir2/Blah.sxw - > Blah.sxw - ::rtl::OUString temp = location; - sal_Int32 lastSlashIndex = temp.lastIndexOf( ::rtl::OUString::createFromAscii( "/" ) ); - - if ( ( lastSlashIndex + 1 ) < temp.getLength() ) - { - temp = temp.copy( lastSlashIndex + 1 ); - } - // maybe we should throw here!!! - else - { - OSL_TRACE("Something wrong with name, perhaps we should throw an exception"); - } - return temp; -} - //----------------------------------------------- ::rtl::OUString SfxConfigGroupListBox_Impl::MapCommand2UIName(const ::rtl::OUString& sCommand) { diff --git a/cui/source/customize/eventdlg.src b/cui/source/customize/eventdlg.src index 9bb68d694..cb1428cac 100644 --- a/cui/source/customize/eventdlg.src +++ b/cui/source/customize/eventdlg.src @@ -63,6 +63,7 @@ TabPage RID_SVXPAGE_EVENTS }; ListBox LB_SAVEIN { + HelpID = "cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN"; Border = TRUE ; Pos = MAP_APPFONT ( 54 , 238 ) ; Size = MAP_APPFONT ( 132 , 53 ) ; @@ -76,6 +77,7 @@ TabPage RID_SVXPAGE_EVENTS }; PushButton PB_ASSIGN { + HelpID = "cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN"; Pos = MAP_APPFONT ( 217 , ROW0A ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Disable = TRUE ; @@ -83,6 +85,7 @@ TabPage RID_SVXPAGE_EVENTS }; PushButton PB_DELETE { + HelpID = "cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE"; Pos = MAP_APPFONT ( 217 , ROW0A+RSC_CD_PUSHBUTTON_HEIGHT+12 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Disable = TRUE ; diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src index 6402587dc..ab891445a 100644 --- a/cui/source/customize/macropg.src +++ b/cui/source/customize/macropg.src @@ -36,7 +36,7 @@ TabPage RID_SVXPAGE_MACROASSIGN { - // HelpID = HID_MACROASSIGN ; + HelpID = "cui:TabPage:RID_SVXPAGE_MACROASSIGN" ; Hide = TRUE ; OutputSize = TRUE ; SVLook = TRUE ; @@ -66,6 +66,7 @@ TabPage RID_SVXPAGE_MACROASSIGN }; PushButton PB_ASSIGN { + HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN"; Pos = MAP_APPFONT ( COL4 , ROW0A ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; Text [ en-US ] = "M~acro..." ; @@ -74,6 +75,7 @@ TabPage RID_SVXPAGE_MACROASSIGN }; PushButton PB_ASSIGN_COMPONENT { + HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN_COMPONENT"; Pos = MAP_APPFONT ( COL4 , ROW2 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; Disable = TRUE ; @@ -82,6 +84,7 @@ TabPage RID_SVXPAGE_MACROASSIGN }; PushButton PB_DELETE { + HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_DELETE"; Pos = MAP_APPFONT ( COL4 , ROW5_REMOVE ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; Text [ en-US ] = "~Remove" ; @@ -112,6 +115,7 @@ TabPage RID_SVXPAGE_MACROASSIGN ModalDialog RID_SVXDLG_ASSIGNCOMPONENT { + HelpID = "cui:ModalDialog:RID_SVXDLG_ASSIGNCOMPONENT"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( COMP_WIDTH , COMP_HEIGHT ) ; @@ -144,6 +148,7 @@ ModalDialog RID_SVXDLG_ASSIGNCOMPONENT }; Edit EDIT_METHOD { + HelpID = "cui:Edit:RID_SVXDLG_ASSIGNCOMPONENT:EDIT_METHOD"; Border = TRUE ; Pos = MAP_APPFONT ( COMP_COL0 , COMP_ROWEDIT ) ; Size = MAP_APPFONT ( COMP_EDIT_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 31b2e367e..3b80d8062 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -154,42 +154,6 @@ void SvxConfigFunctionListBox_Impl::ClearAll() Clear(); } -SvLBoxEntry* SvxConfigFunctionListBox_Impl::GetEntry_Impl( const String& rName ) -{ - SvLBoxEntry *pEntry = First(); - while ( pEntry ) - { - if ( GetEntryText( pEntry ) == rName ) - return pEntry; - pEntry = Next( pEntry ); - } - - return NULL; -} - -SvLBoxEntry* SvxConfigFunctionListBox_Impl::GetEntry_Impl( USHORT nId ) -{ - SvLBoxEntry *pEntry = First(); - while ( pEntry ) - { - SvxGroupInfo_Impl *pData = (SvxGroupInfo_Impl*) pEntry->GetUserData(); - if ( pData && pData->nOrd == nId ) - return pEntry; - pEntry = Next( pEntry ); - } - - return NULL; -} - -USHORT SvxConfigFunctionListBox_Impl::GetId( SvLBoxEntry *pEntry ) -{ - SvxGroupInfo_Impl *pData = pEntry ? - (SvxGroupInfo_Impl*) pEntry->GetUserData() : 0; - if ( pData ) - return pData->nOrd; - return 0; -} - String SvxConfigFunctionListBox_Impl::GetHelpText( SvLBoxEntry *pEntry ) { // Information zum selektierten Entry aus den Userdaten holen @@ -1214,12 +1178,6 @@ SvxScriptSelectorDialog::SetDialogDescription( const String& rDescription ) aDialogDescription.SetText( rDescription ); } -USHORT -SvxScriptSelectorDialog::GetSelectedId() -{ - return aCommands.GetId( aCommands.GetLastSelectedEntry() ); -} - String SvxScriptSelectorDialog::GetScriptURL() const { diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 22ea4611a..a6c628885 100644..100755 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -76,6 +76,8 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::linguistic2; +using ::rtl::OUString; + #define C2U(cChar) ::rtl::OUString::createFromAscii(cChar) // struct SpellDialog_Impl --------------------------------------------- @@ -930,7 +932,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang) -----------------------------------------------------------------------*/ void SpellDialog::InitUserDicts() { - sal_uInt16 nLang = aLanguageLB.GetSelectLanguage(); + const LanguageType nLang = aLanguageLB.GetSelectLanguage(); const Reference< XDictionary > *pDic = 0; @@ -948,51 +950,50 @@ void SpellDialog::InitUserDicts() pImpl->aDics = xDicList->getDictionaries(); } - // Benutzerbuecher anzeigen + SvtLinguConfig aCfg; + const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); + + // list suitable dictionaries + bool bEnable = false; const sal_Int32 nSize = pImpl->aDics.getLength(); pDic = pImpl->aDics.getConstArray(); - sal_Int32 i; delete aAddToDictMB.GetPopupMenu(); PopupMenu* pMenu = new PopupMenu; - for (i = 0; i < nSize; ++i ) + pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS); + USHORT nItemId = 1; // menu items should be enumerated from 1 and not 0 + for (sal_Int32 i = 0; i < nSize; ++i) { - Reference< XDictionary > xDic( pDic[i], UNO_QUERY ); - if (!xDic.is() || SvxGetIgnoreAllList() == xDic) + uno::Reference< linguistic2::XDictionary > xDicTmp( pDic[i], uno::UNO_QUERY ); + if (!xDicTmp.is() || SvxGetIgnoreAllList() == xDicTmp) continue; - // add only active and not read-only dictionaries to list - // from which to choose from - Reference< frame::XStorable > xStor( xDic, UNO_QUERY ); - if ( xDic->isActive() && (!xStor.is() || !xStor->isReadonly()) ) + uno::Reference< frame::XStorable > xStor( xDicTmp, uno::UNO_QUERY ); + LanguageType nActLanguage = SvxLocaleToLanguage( xDicTmp->getLocale() ); + if( xDicTmp->isActive() + && xDicTmp->getDictionaryType() != linguistic2::DictionaryType_NEGATIVE + && (nLang == nActLanguage || LANGUAGE_NONE == nActLanguage ) + && (!xStor.is() || !xStor->isReadonly()) ) { - sal_Bool bNegativ = xDic->getDictionaryType() == DictionaryType_NEGATIVE; - pMenu->InsertItem( (USHORT)i + 1, ::GetDicInfoStr( xDic->getName(), - SvxLocaleToLanguage( xDic->getLocale() ), bNegativ ) ); - } - } - aAddToDictMB.SetPopupMenu(pMenu); - - aAddToDictMB.Disable(); + pMenu->InsertItem( nItemId, xDicTmp->getName() ); + bEnable = sal_True; - sal_uInt16 k; - for ( k = 0; k < pMenu->GetItemCount(); ++k ) - { - sal_uInt16 nId = pMenu->GetItemId(k) - 1; - sal_Bool bFound = sal_False; - - const sal_uInt16 nDicLang = SvxLocaleToLanguage( pDic[nId]->getLocale() ); - const sal_Bool bDicNegativ = - pDic[nId]->getDictionaryType() == DictionaryType_NEGATIVE; - // Stimmt die Sprache "uberein, dann enable - if ((nDicLang == nLang || nDicLang == LANGUAGE_NONE) && !bDicNegativ) - bFound = sal_True; + uno::Reference< lang::XServiceInfo > xSvcInfo( xDicTmp, uno::UNO_QUERY ); + if (xSvcInfo.is()) + { + OUString aDictionaryImageUrl( aCfg.GetSpellAndGrammarContextDictionaryImage( + xSvcInfo->getImplementationName(), bHC) ); + if (aDictionaryImageUrl.getLength() > 0) + { + Image aImage( lcl_GetImageFromPngUrl( aDictionaryImageUrl ) ); + pMenu->SetItemImage( nItemId, aImage ); + } + } - if (bFound) - { - aAddToDictMB.Enable(); - break; + ++nItemId; } } + aAddToDictMB.SetPopupMenu(pMenu); + aAddToDictMB.Enable( bEnable ); } /*-- 20.10.2003 15:31:06--------------------------------------------------- @@ -1000,31 +1001,39 @@ void SpellDialog::InitUserDicts() IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton ) { aSentenceED.UndoActionStart( SPELLUNDO_CHANGE_GROUP ); - USHORT nItem = pButton->GetCurItemId(); //GetErrorText() returns the current error even if the text is already //manually changed - String sNewWord= aSentenceED.GetErrorText(); + const String aNewWord= aSentenceED.GetErrorText(); + + USHORT nItemId = pButton->GetCurItemId(); + PopupMenu *pMenu = pButton->GetPopupMenu(); + String aDicName ( pMenu->GetItemText( nItemId ) ); + + uno::Reference< linguistic2::XDictionary > xDic; + uno::Reference< linguistic2::XDictionaryList > xDicList( SvxGetDictionaryList() ); + if (xDicList.is()) + xDic = xDicList->getDictionaryByName( aDicName ); - Reference< XDictionary > xDic( pImpl->aDics.getConstArray()[ nItem - 1 ], UNO_QUERY ); sal_Int16 nAddRes = DIC_ERR_UNKNOWN; if (xDic.is()) { - String sTmpTxt( sNewWord ); - sal_Bool bNegEntry = xDic->getDictionaryType() == DictionaryType_NEGATIVE; - nAddRes = linguistic::AddEntryToDic( xDic, sTmpTxt, bNegEntry, - ::rtl::OUString(), LANGUAGE_NONE ); + nAddRes = linguistic::AddEntryToDic( xDic, aNewWord, FALSE, OUString(), LANGUAGE_NONE ); + // save modified user-dictionary if it is persistent + uno::Reference< frame::XStorable > xSavDic( xDic, uno::UNO_QUERY ); + if (xSavDic.is()) + xSavDic->store(); - if(nAddRes == DIC_ERR_NONE) + if (nAddRes == DIC_ERR_NONE) { SpellUndoAction_Impl* pAction = new SpellUndoAction_Impl( SPELLUNDO_CHANGE_ADD_TO_DICTIONARY, aDialogUndoLink); - pAction->SetDictionary(xDic); - pAction->SetAddedWord(sTmpTxt); - aSentenceED.AddUndoAction(pAction); + pAction->SetDictionary( xDic ); + pAction->SetAddedWord( aNewWord ); + aSentenceED.AddUndoAction( pAction ); } // failed because there is already an entry? - if (DIC_ERR_NONE != nAddRes && xDic->getEntry( sTmpTxt ).is()) + if (DIC_ERR_NONE != nAddRes && xDic->getEntry( aNewWord ).is()) nAddRes = DIC_ERR_NONE; } if (DIC_ERR_NONE != nAddRes) @@ -1032,8 +1041,6 @@ IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton ) SvxDicError( this, nAddRes ); return 0; // Nicht weitermachen } - // nach dem Aufnehmen ggf. '='-Zeichen entfernen - sNewWord.EraseAllChars( sal_Unicode( '=' ) ); // go on SpellContinue_Impl(); diff --git a/cui/source/dialogs/SpellDialog.src b/cui/source/dialogs/SpellDialog.src index b91bea098..d1bb22989 100644 --- a/cui/source/dialogs/SpellDialog.src +++ b/cui/source/dialogs/SpellDialog.src @@ -61,6 +61,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK }; ListBox LB_LANGUAGE { + HelpID = "cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE"; Pos = MAP_APPFONT( 110, 6 ); Size = MAP_APPFONT( 93, 55 ); Border = TRUE; @@ -76,6 +77,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK MultiLineEdit ED_NEWWORD { + HelpID = "cui:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD"; Pos = MAP_APPFONT( 6, 37 ); Size = MAP_APPFONT( 197, 48 ); Border = TRUE; @@ -91,6 +93,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK }; ListBox LB_SUGGESTION { + HelpID = "cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION"; Pos = MAP_APPFONT( 6, 99 ); Size = MAP_APPFONT( 197, 48 ); Border = TRUE; @@ -98,6 +101,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK CheckBox CB_CHECK_GRAMMAR { + HelpID = "cui:CheckBox:RID_SVXDLG_SPELLCHECK:CB_CHECK_GRAMMAR"; Pos = MAP_APPFONT( 6, 153 ); Size = MAP_APPFONT( 100, 10 ); Text [ en-US ] = "Check ~grammar" ; @@ -106,6 +110,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK PushButton PB_IGNORE { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNORE"; Pos = MAP_APPFONT( 209, 37 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "~Ignore Once" ; @@ -113,12 +118,14 @@ ModelessDialog RID_SVXDLG_SPELLCHECK PushButton PB_IGNOREALL { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNOREALL"; Pos = MAP_APPFONT( 209, 54 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "I~gnore All" ; }; PushButton PB_IGNORERULE { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNORERULE"; Pos = MAP_APPFONT( 209, 54 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "I~gnore Rule" ; @@ -126,6 +133,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK }; MenuButton MB_ADDTODICT { + HelpID = "cui:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT"; Pos = MAP_APPFONT( 209, 71 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "~Add" ; @@ -133,6 +141,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK PushButton PB_CHANGE { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CHANGE"; Pos = MAP_APPFONT( 209, 99 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "~Change" ; @@ -141,12 +150,14 @@ ModelessDialog RID_SVXDLG_SPELLCHECK PushButton PB_CHANGEALL { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CHANGEALL"; Pos = MAP_APPFONT( 209, 117 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "Change A~ll" ; }; PushButton PB_EXPLAIN { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_EXPLAIN"; Pos = MAP_APPFONT( 209, 117 ); Size = MAP_APPFONT( 55, 14 ); Hide = TRUE; @@ -154,6 +165,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK }; PushButton PB_AUTOCORR { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR"; Pos = MAP_APPFONT( 209, 134 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "AutoCor~rect" ; @@ -172,12 +184,14 @@ ModelessDialog RID_SVXDLG_SPELLCHECK }; PushButton PB_OPTIONS { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS"; Pos = MAP_APPFONT( 87, 170 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "O~ptions..." ; }; PushButton PB_UNDO { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO"; Pos = MAP_APPFONT( 148, 170 ); Size = MAP_APPFONT( 55, 14 ); Text [ en-US ] = "~Undo" ; @@ -185,6 +199,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK PushButton PB_CLOSE { + HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CLOSE"; Pos = MAP_APPFONT ( 209 , 170 ) ; Size = MAP_APPFONT ( 55 , 14 ) ; TabStop = TRUE ; diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src index 835ab608a..c59c7381a 100644 --- a/cui/source/dialogs/charmap.src +++ b/cui/source/dialogs/charmap.src @@ -35,10 +35,9 @@ // RID_SVXDLG_CHARMAP ---------------------------------------------------- ModalDialog RID_SVXDLG_CHARMAP { - HelpId = SID_CHARMAP ; + HelpId = CMD_SID_CHARMAP ; SvLook = TRUE ; Text [ en-US ] = "Special Characters"; -/* Size = MAP_APPFONT ( 297 , 169 ) ; */ Size = MAP_APPFONT ( 297 , 153 ) ; OutputSize = TRUE ; Moveable = TRUE ; @@ -61,6 +60,7 @@ ModalDialog RID_SVXDLG_CHARMAP }; ListBox LB_FONT { + HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT"; Pos = MAP_APPFONT ( 42 , 6 ) ; Size = MAP_APPFONT ( 70 , 58 ) ; Sort = TRUE ; @@ -75,6 +75,7 @@ ModalDialog RID_SVXDLG_CHARMAP }; ListBox LB_SUBSET { + HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET"; Pos = MAP_APPFONT ( 161 , 6 ) ; Size = MAP_APPFONT ( 63 , 68 ) ; Sort = FALSE ; @@ -92,7 +93,6 @@ ModalDialog RID_SVXDLG_CHARMAP { HelpId = HID_CHARMAP_CTL_SHOWTEXT ; Pos = MAP_APPFONT ( 46 , 137 ) ; -/* Size = MAP_APPFONT ( 190 , 16 ) ; */ Size = MAP_APPFONT ( 244 , 16 ) ; Group = TRUE ; }; @@ -130,30 +130,11 @@ ModalDialog RID_SVXDLG_CHARMAP }; PushButton BTN_DELETE { + HelpID = "cui:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE"; Pos = MAP_APPFONT ( 242 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete"; }; -/* - PushButton BT_ASSIGN - { - Pos = MAP_APPFONT ( 242 , 140 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Text [ en-US ] = "~Assign shortcut..."; - }; - FixedText FT_ASSIGN - { - Pos = MAP_APPFONT ( 6 , 156 ) ; - Size = MAP_APPFONT ( 100 , 8 ) ; - Left = TRUE ; - Text [ en-US ] = "Shortcut key: "; - }; - Control CT_ASSIGN - { - Pos = MAP_APPFONT ( 60 , 156 ) ; - Size = MAP_APPFONT ( 160 , 8 ) ; - }; -*/ }; // ********************************************************************** EOF diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx index 059c983c5..848ec0598 100644 --- a/cui/source/dialogs/commonlingui.cxx +++ b/cui/source/dialogs/commonlingui.cxx @@ -183,52 +183,6 @@ void SvxCommonLinguisticControl::InsertControlGroup( Window& _rFirstGroupWindow, // (FirstWindow, LastWindow) was no valid control group } -// ----------------------------------------------------------------------- -String SvxCommonLinguisticControl::GetNewEditWord() -{ - return aNewWordED.GetText(); -} - -// ----------------------------------------------------------------------- -void SvxCommonLinguisticControl::SetNewEditWord( const String& _rNew ) -{ - aNewWordED.SetText( _rNew ); -} - -//----------------------------------------------------------------------------- -void SvxCommonLinguisticControl::UpdateIgnoreHelp( ) -{ - - String aInfoStr( RTL_CONSTASCII_USTRINGPARAM( ": " ) ); - aInfoStr.Append( GetCurrentText() ); - - String aString = GetNonMnemonicString( aIgnoreAllBtn.GetText() ); - aString.Append( aInfoStr ); - aIgnoreAllBtn.SetQuickHelpText( aString ); - - aString = GetNonMnemonicString( aIgnoreBtn.GetText() ); - aString.Append( aInfoStr ); - aIgnoreBtn.SetQuickHelpText( aString ); -} - -//----------------------------------------------------------------------------- -void SvxCommonLinguisticControl::UpdateChangesHelp( const String& _rNewText ) -{ - String aInfoStr( RTL_CONSTASCII_USTRINGPARAM( ": " ) ); - aInfoStr.Append( GetCurrentText() ); - aInfoStr.Append( String( RTL_CONSTASCII_USTRINGPARAM( " -> " ) ) ); - aInfoStr.Append( _rNewText ); - // TODO: shouldn't this be part of the resources, for proper localization? - - String aString = GetNonMnemonicString( aChangeAllBtn.GetText() ); - aString.Append( aInfoStr ); - aChangeAllBtn.SetQuickHelpText( aString ); - - aString = GetNonMnemonicString( aChangeBtn.GetText() ); - aString.Append( aInfoStr ); - aChangeBtn.SetQuickHelpText( aString ); -} - //----------------------------------------------------------------------------- void SvxCommonLinguisticControl::Paint( const Rectangle& rRect ) { diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx index 0a15def01..3356b5cb8 100644 --- a/cui/source/dialogs/commonlingui.hxx +++ b/cui/source/dialogs/commonlingui.hxx @@ -152,18 +152,6 @@ public: // returns the location (upper-left corner) of the group of action buttons inline Point GetActionButtonsLocation( ) const { return aIgnoreBtn.GetPosPixel(); } - - // updates the help texts for the "change" and "change all" buttons according to the currently - // entered texts - void UpdateChangesHelp( const String& _rNewText ); - inline void UpdateChangesHelp( ) { UpdateChangesHelp( GetWordInputControl().GetText() ); } - - // updates the help texts for the "ignore" and "always ignore" buttons according to the currently - // entered texts - void UpdateIgnoreHelp( ); - - String GetNewEditWord(); - void SetNewEditWord( const String& _rNew ); }; diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 9e0792333..8977abe48 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -40,7 +40,6 @@ #include <svx/gallery1.hxx> #include <svx/galtheme.hxx> #include "cuigaldlg.hxx" -#include <svl/pickerhelper.hxx> #include "helpid.hrc" #include <unotools/syslocale.hxx> #include <cppuhelper/implbase1.hxx> @@ -959,7 +958,7 @@ void TPGalleryThemeProperties::FillFilterList() } } -#if defined(WIN) || defined(WNT) +#if defined(WNT) if ( aExtensions.Len() > 240 ) aExtensions = DEFINE_CONST_UNICODE( "*.*" ); #endif @@ -1035,7 +1034,6 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG ) if ( xFolderPicker.is() ) { -// svt::SetDialogHelpId( xFolderPicker, HID_GALLERY_NEWTHEME_FINDFILES ); String aDlgPathName( SvtPathOptions().GetGraphicPath() ); xFolderPicker->setDisplayDirectory(aDlgPathName); @@ -1146,7 +1144,6 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeHdl, void*, EMPTYARG ) if( !aLbxFound.GetSelectEntryCount() || !bEntriesFound ) { SvxOpenGraphicDialog aDlg(String( RTL_CONSTASCII_USTRINGPARAM( "Gallery" ) ) ); -// aDlg.SetDialogHelpId( HID_GALLERY_NEWTHEME_ADDFILES ); aDlg.EnableLink(sal_False); aDlg.AsLink(sal_False); diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 573819dfe..83f59438e 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -136,9 +136,6 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, aImage, aImageHC, SvxHyperlinkNewDocTp::Create ); pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) ); - // all tab pages set -> create mnemonics - // CreateIconTextAutoMnemonics(); #99671# not useful, because this is not what user expects when using mnemonics on the pages - // create itemset for tabpages mpItemSet = new SfxItemSet( SFX_APP()->GetPool(), SID_HYPERLINK_GETLINK, SID_HYPERLINK_SETLINK ); diff --git a/cui/source/dialogs/cuiimapdlg.src b/cui/source/dialogs/cuiimapdlg.src index a7550bcf1..95ed0f483 100755..100644 --- a/cui/source/dialogs/cuiimapdlg.src +++ b/cui/source/dialogs/cuiimapdlg.src @@ -31,6 +31,7 @@ ModalDialog RID_SVXDLG_IMAPURL { + HelpID = "cui:ModalDialog:RID_SVXDLG_IMAPURL"; SVLook = TRUE ; OutputSize = TRUE ; Closeable = TRUE ; @@ -46,6 +47,7 @@ ModalDialog RID_SVXDLG_IMAPURL }; Edit EDT_URL { + HelpID = "cui:Edit:RID_SVXDLG_IMAPURL:EDT_URL"; Border = TRUE ; TabStop = TRUE ; Left = TRUE ; @@ -61,6 +63,7 @@ ModalDialog RID_SVXDLG_IMAPURL }; ComboBox CBB_TARGETS { + HelpID = "cui:ComboBox:RID_SVXDLG_IMAPURL:CBB_TARGETS"; Border = TRUE ; Sort = TRUE ; Pos = MAP_APPFONT ( 6 , 43 ) ; @@ -78,6 +81,7 @@ ModalDialog RID_SVXDLG_IMAPURL }; Edit EDT_NAME { + HelpID = "cui:Edit:RID_SVXDLG_IMAPURL:EDT_NAME"; Border = TRUE ; TabStop = TRUE ; Left = TRUE ; @@ -94,6 +98,7 @@ ModalDialog RID_SVXDLG_IMAPURL Edit EDT_URLDESCRIPTION { + HelpID = "cui:Edit:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION"; Border = TRUE ; TabStop = TRUE ; Left = TRUE ; @@ -109,6 +114,7 @@ ModalDialog RID_SVXDLG_IMAPURL MultiLineEdit EDT_DESCRIPTION { + HelpID = "cui:MultiLineEdit:RID_SVXDLG_IMAPURL:EDT_DESCRIPTION"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 122 ) ; Size = MAP_APPFONT ( 202 , 34 ) ; diff --git a/cui/source/dialogs/dlgname.src b/cui/source/dialogs/dlgname.src index ee29629dc..a7f377ba5 100644 --- a/cui/source/dialogs/dlgname.src +++ b/cui/source/dialogs/dlgname.src @@ -49,6 +49,7 @@ ModalDialog RID_SVXDLG_NAME }; Edit EDT_STRING { + HelpID = "cui:Edit:RID_SVXDLG_NAME:EDT_STRING"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 112 , 12 ) ; @@ -96,6 +97,7 @@ ModalDialog RID_SVXDLG_OBJECT_NAME }; Edit NTD_EDT_NAME { + HelpID = "cui:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 168 , 12 ) ; @@ -153,6 +155,7 @@ ModalDialog RID_SVXDLG_OBJECT_TITLE_DESC }; Edit NTD_EDT_TITLE { + HelpID = "cui:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 168 , 12 ) ; @@ -169,6 +172,7 @@ ModalDialog RID_SVXDLG_OBJECT_TITLE_DESC }; MultiLineEdit NTD_EDT_DESC { + HelpID = "cui:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 41 ) ; Size = MAP_APPFONT ( 168 , (12 * 3) - 2 ) ; @@ -218,12 +222,14 @@ ModalDialog RID_SVXDLG_MESSBOX Moveable = TRUE ; PushButton BTN_1 { + HelpID = "cui:PushButton:RID_SVXDLG_MESSBOX:BTN_1"; Pos = MAP_APPFONT ( 25 , 44 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; PushButton BTN_2 { + HelpID = "cui:PushButton:RID_SVXDLG_MESSBOX:BTN_2"; Pos = MAP_APPFONT ( 78 , 44 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/cui/source/dialogs/fmsearch.src b/cui/source/dialogs/fmsearch.src index 1b56c1634..62bae4533 100644 --- a/cui/source/dialogs/fmsearch.src +++ b/cui/source/dialogs/fmsearch.src @@ -45,6 +45,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM }; RadioButton RB_SEARCHFORTEXT { + HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORTEXT"; Pos = MAP_APPFONT( 12, 23 ); Size = MAP_APPFONT( 50, 10 ); Group = TRUE; @@ -52,12 +53,14 @@ ModalDialog RID_SVXDLG_SEARCHFORM }; RadioButton RB_SEARCHFORNULL { + HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNULL"; Pos = MAP_APPFONT( 12, 36 ); Size = MAP_APPFONT( 207, 10 ); Text [ en-US ] = "Field content is ~NULL"; }; RadioButton RB_SEARCHFORNOTNULL { + HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNOTNULL"; Pos = MAP_APPFONT( 12, 49 ); Size = MAP_APPFONT( 207, 10 ); Text [ en-US ] = "Field content is not NU~LL"; @@ -86,6 +89,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM }; ListBox LB_FORM { + HelpID = "cui:ListBox:RID_SVXDLG_SEARCHFORM:LB_FORM"; Border = TRUE; Pos = MAP_APPFONT( 110, 76 ); Size = MAP_APPFONT( 109, 60 ); @@ -102,6 +106,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM }; RadioButton RB_SINGLEFIELD { + HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SINGLEFIELD"; Pos = MAP_APPFONT( 24, 106 ); Size = MAP_APPFONT( 75, 10 ); Text [ en-US ] = "Single field"; @@ -204,6 +209,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM }; CheckBox CB_HALFFULLFORMS { + HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_HALFFULLFORMS"; Pos = MAP_APPFONT( 105, 209 ); Size = MAP_APPFONT( 85, 10 ); TabStop = TRUE ; @@ -211,6 +217,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM }; CheckBox CB_SOUNDSLIKECJK { + HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_SOUNDSLIKECJK"; Pos = MAP_APPFONT( 190, 209 ); Size = MAP_APPFONT( 84, 10 ); TabStop = TRUE ; @@ -218,6 +225,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM }; PushButton PB_SOUNDSLIKESETTINGS { + HelpID = "cui:PushButton:RID_SVXDLG_SEARCHFORM:PB_SOUNDSLIKESETTINGS"; Pos = MAP_APPFONT( 275, 207 ); Size = MAP_APPFONT( 14, 14 ); TabStop = TRUE ; diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src index 0b7601d53..9679d15b1 100644 --- a/cui/source/dialogs/gallery.src +++ b/cui/source/dialogs/gallery.src @@ -94,6 +94,7 @@ TabPage RID_SVXTABPAGE_GALLERY_GENERAL }; Edit EDT_MS_NAME { + HelpID = "cui:Edit:RID_SVXTABPAGE_GALLERY_GENERAL:EDT_MS_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 10 ) ; Size = MAP_APPFONT ( 194 , 12 ) ; @@ -174,6 +175,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES }; ComboBox CBB_FILETYPE { + HelpID = "cui:ComboBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE"; Pos = MAP_APPFONT ( 57 , 6 ) ; Size = MAP_APPFONT ( 121 , 69 ) ; TabStop = TRUE ; @@ -183,6 +185,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES }; MultiListBox LBX_FOUND { + HelpID = "cui:MultiListBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 23 ) ; Size = MAP_APPFONT ( 172 , 156 ) ; @@ -191,6 +194,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES }; PushButton BTN_SEARCH { + HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH"; Pos = MAP_APPFONT ( 184 , 6 ) ; Size = MAP_APPFONT ( 70 , 14 ) ; TabStop = TRUE ; @@ -198,6 +202,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES }; PushButton BTN_TAKE { + HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE"; Pos = MAP_APPFONT ( 184 , 24 ) ; Size = MAP_APPFONT ( 70 , 14 ) ; TabStop = TRUE ; @@ -205,6 +210,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES }; PushButton BTN_TAKEALL { + HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL"; Pos = MAP_APPFONT ( 184 , 42 ) ; Size = MAP_APPFONT ( 70 , 14 ) ; TabStop = TRUE ; @@ -212,6 +218,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES }; CheckBox CBX_PREVIEW { + HelpID = "cui:CheckBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW"; Pos = MAP_APPFONT ( 184 , 76 ) ; Size = MAP_APPFONT ( 70 , 12 ) ; Text [ en-US ] = "Pr~eview" ; @@ -224,6 +231,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES }; PushButton BTN_MADDIN1 { + HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_MADDIN1"; Pos = MAP_APPFONT ( 220 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -231,6 +239,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES }; PushButton BTN_MADDIN2 { + HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_MADDIN2"; Pos = MAP_APPFONT ( 220 , 80 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -388,6 +397,7 @@ ModalDialog RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS ModalDialog RID_SVXDLG_GALLERY_THEMEID { + HelpID = "cui:ModalDialog:RID_SVXDLG_GALLERY_THEMEID"; OutputSize = TRUE ; Border = TRUE ; SVLook = TRUE ; @@ -415,6 +425,7 @@ ModalDialog RID_SVXDLG_GALLERY_THEMEID }; ListBox LB_RESNAME { + HelpID = "cui:ListBox:RID_SVXDLG_GALLERY_THEMEID:LB_RESNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 100 , 60 ) ; diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src index f91a66790..146928a77 100644 --- a/cui/source/dialogs/grfflt.src +++ b/cui/source/dialogs/grfflt.src @@ -37,7 +37,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC { - HelpID = SID_GRFFILTER_MOSAIC; + HelpID = CMD_SID_GRFFILTER_MOSAIC; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; @@ -66,6 +66,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC #define MA_Y1 MA_Y0 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y MetricField DLG_FILTERMOSAIC_MTR_WIDTH { + HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , MA_Y1 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -91,6 +92,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC #define MA_Y3 MA_Y2 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y MetricField DLG_FILTERMOSAIC_MTR_HEIGHT { + HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 12, MA_Y3 ) ; Size = MAP_APPFONT ( 35, 12 ) ; @@ -109,6 +111,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC #define MA_Y4 MA_Y3 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_Y CheckBox DLG_FILTERMOSAIC_CBX_EDGES { + HelpID = "cui:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES"; Pos = MAP_APPFONT ( 12, MA_Y4 ) ; Size = MAP_APPFONT ( 91, 12 ) ; TabStop = TRUE ; @@ -141,7 +144,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE { - HelpID = SID_GRFFILTER_SOLARIZE; + HelpID = CMD_SID_GRFFILTER_SOLARIZE; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; @@ -170,6 +173,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE #define MA_Y6 MA_Y5 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y MetricField DLG_FILTERSOLARIZE_MTR_THRESHOLD { + HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_MTR_THRESHOLD"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , MA_Y6 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -186,6 +190,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE #define MA_Y7 MA_Y6 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y CheckBox DLG_FILTERSOLARIZE_CBX_INVERT { + HelpID = "cui:CheckBox:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_CBX_INVERT"; Pos = MAP_APPFONT ( 12, 46 ) ; Size = MAP_APPFONT ( 77, 12 ) ; TabStop = TRUE ; @@ -218,7 +223,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA { - HelpID = SID_GRFFILTER_SEPIA; + HelpID = CMD_SID_GRFFILTER_SEPIA; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; @@ -247,6 +252,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA #define MA_Y9 MA_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y MetricField DLG_FILTERSEPIA_MTR_SEPIA { + HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_SEPIA:DLG_FILTERSEPIA_MTR_SEPIA"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , MA_Y9 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -290,7 +296,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA ModalDialog RID_SVX_GRFFILTER_DLG_POSTER { - HelpID = SID_GRFFILTER_POSTER; + HelpID = CMD_SID_GRFFILTER_POSTER; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; @@ -319,6 +325,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER #define MA_Y11 MA_Y10 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y NumericField DLG_FILTERPOSTER_NUM_POSTER { + HelpID = "cui:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_POSTER"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , MA_Y11 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -359,13 +366,14 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER TabPage RID_SVX_GRFFILTER_DLG_EMBOSS_TAB { + HelpID = "cui:TabPage:RID_SVX_GRFFILTER_DLG_EMBOSS_TAB"; Pos = MAP_APPFONT ( 0, 0 ) ; Size = MAP_APPFONT ( 0, 0 ) ; }; ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS { - HelpID = SID_GRFFILTER_EMBOSS; + HelpID = CMD_SID_GRFFILTER_EMBOSS; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index edbfb7f4d..73a303a63 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -690,12 +690,6 @@ namespace svx } //------------------------------------------------------------------------- - void HangulHanjaConversionDialog::SetOptionsHdl( const Link& _rHdl ) - { - m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eOptions, _rHdl ); - } - - //------------------------------------------------------------------------- void HangulHanjaConversionDialog::SetFindHdl( const Link& _rHdl ) { m_aFind.SetClickHdl( _rHdl ); @@ -866,11 +860,6 @@ namespace svx } //------------------------------------------------------------------------- - sal_Bool HangulHanjaConversionDialog::GetByCharacter( ) const - { - return m_aReplaceByChar.IsChecked(); - } - //------------------------------------------------------------------------- void HangulHanjaConversionDialog::SetConversionDirectionState( sal_Bool _bTryBothDirections, HHC::ConversionDirection _ePrimaryConversionDirection ) diff --git a/cui/source/dialogs/hangulhanjadlg.src b/cui/source/dialogs/hangulhanjadlg.src index 46f52601f..c7c7172de 100644 --- a/cui/source/dialogs/hangulhanjadlg.src +++ b/cui/source/dialogs/hangulhanjadlg.src @@ -44,6 +44,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA PushButton PB_FIND { + HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA:PB_FIND"; Pos = MAP_APPFONT( 207, 23 ); Size = MAP_APPFONT( 30, 14 ); @@ -67,6 +68,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA RadioButton RB_SIMPLE_CONVERSION { + HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_SIMPLE_CONVERSION"; Pos = MAP_APPFONT( 51, 81 ); Size = MAP_APPFONT( 60, 8 ); @@ -77,6 +79,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA RadioButton RB_HANJA_HANGUL_BRACKETED { + HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BRACKETED"; Pos = MAP_APPFONT( 114, 81 ); Size = MAP_APPFONT( 60, 8 ); @@ -85,6 +88,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA RadioButton RB_HANGUL_HANJA_BRACKETED { + HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BRACKETED"; Pos = MAP_APPFONT( 177, 81 ); Size = MAP_APPFONT( 60, 8 ); @@ -93,6 +97,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA RadioButton RB_HANGUL_HANJA_ABOVE { + HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_ABOVE"; Pos = MAP_APPFONT( 51, 95 ); Size = MAP_APPFONT( 60, 16 ); @@ -102,6 +107,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA RadioButton RB_HANGUL_HANJA_BELOW { + HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BELOW"; Pos = MAP_APPFONT( 114, 95 ); Size = MAP_APPFONT( 60, 16 ); @@ -111,6 +117,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA RadioButton RB_HANJA_HANGUL_ABOVE { + HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_ABOVE"; Pos = MAP_APPFONT( 56, 114 ); Size = MAP_APPFONT( 60, 16 ); @@ -120,6 +127,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA RadioButton RB_HANJA_HANGUL_BELOW { + HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BELOW"; Pos = MAP_APPFONT( 114, 114 ); Size = MAP_APPFONT( 60, 16 ); @@ -137,6 +145,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA CheckBox CB_HANGUL_ONLY { + HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANGUL_ONLY"; Pos = MAP_APPFONT( 51, 134 ); Size = MAP_APPFONT( 60, 8 ); @@ -145,6 +154,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA CheckBox CB_HANJA_ONLY { + HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANJA_ONLY"; Pos = MAP_APPFONT( 114, 134 ); Size = MAP_APPFONT( 55, 8 ); @@ -159,6 +169,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA CheckBox CB_REPLACE_BY_CHARACTER { + HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_REPLACE_BY_CHARACTER"; Pos = MAP_APPFONT( 241, 81 ); Size = MAP_APPFONT( 55, 24 ); @@ -212,36 +223,42 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_OPT }; CheckBox CB_IGNOREPOST { + HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST"; Pos = MAP_APPFONT ( HHO_COL_1a, HHO_ROW_9 ) ; Size = MAP_APPFONT ( HHO_COL_6 - HHO_COL_1a , 12 ) ; Text[ en-US ] = "Ignore post-positional word"; }; CheckBox CB_SHOWRECENTLYFIRST { + HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST"; Pos = MAP_APPFONT ( HHO_COL_1a, HHO_ROW_11 ) ; Size = MAP_APPFONT ( HHO_COL_6 - HHO_COL_1a , 12 ) ; Text [ en-US ] = "Show recently used entries first"; }; CheckBox CB_AUTOREPLACEUNIQUE { + HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE"; Pos = MAP_APPFONT ( HHO_COL_1a, HHO_ROW_12 ) ; Size = MAP_APPFONT ( HHO_COL_6 - HHO_COL_1a , 12 ) ; Text [ en-US ] = "Replace all unique entries automatically"; }; PushButton PB_HHO_NEW { + HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW"; Pos = MAP_APPFONT ( HHO_COL_3 , HHO_ROW_2 ) ; Size = MAP_APPFONT ( HHO_COL_4 - HHO_COL_3 , 14 ) ; Text [ en-US ] = "New..."; }; PushButton PB_HHO_EDIT { + HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT"; Pos = MAP_APPFONT ( HHO_COL_3 , HHO_ROW_4 ) ; Size = MAP_APPFONT ( HHO_COL_4 - HHO_COL_3 , 14 ) ; Text [ en-US ] = "Edit..."; }; PushButton PB_HHO_DELETE { + HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE"; Pos = MAP_APPFONT ( HHO_COL_3 , HHO_ROW_6 ) ; Size = MAP_APPFONT ( HHO_COL_4 - HHO_COL_3 , 14 ) ; Text [ en-US ] = "Delete"; @@ -291,6 +308,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_NEWDICT }; Edit ED_DICTNAME { + HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 55 , 14 ) ; Size = MAP_APPFONT ( 90 , 12 ) ; @@ -340,6 +358,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT }; ListBox LB_BOOK { + HelpID = "cui:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK"; Pos = MAP_APPFONT ( HHE_COL_3 , HHE_ROW_1 ) ; Size = MAP_APPFONT ( HHE_COL_4 - HHE_COL_3 , 60 ) ; DropDown = TRUE; @@ -353,6 +372,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT }; ComboBox LB_ORIGINAL { + HelpID = "cui:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL"; Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_5 ) ; Size = MAP_APPFONT ( HHE_COL_4 - HHE_COL_1 , 60 ) ; DropDown = TRUE; @@ -366,6 +386,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT }; Edit ED_1 { + HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1"; Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 ) ; Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ; Hide = False; @@ -373,6 +394,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT }; Edit ED_2 { + HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2"; Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 12 ) ; Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ; Hide = False; @@ -380,6 +402,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT }; Edit ED_3 { + HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3"; Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 24 ) ; Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ; Hide = False; @@ -387,6 +410,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT }; Edit ED_4 { + HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4"; Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 36 ) ; Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ; Hide = False; @@ -401,12 +425,14 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT }; PushButton PB_HHE_NEW { + HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW"; Pos = MAP_APPFONT ( HHE_COL_5 , HHE_ROW_a1 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; Text [ en-US ] = "New"; }; PushButton PB_HHE_DELETE { + HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE"; Pos = MAP_APPFONT ( HHE_COL_5 , HHE_ROW_a3 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; Text [ en-US ] = "Delete"; diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index cf74a4b06..c63ec3f46 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -173,37 +173,6 @@ void SvxHyperlinkNewDocTp::FillDlgFields ( String& /*aStrURL*/ ) #define INTERNETSHORTCUT_URL_TAG "URL" #define INTERNETSHORTCUT_ICONID_TAG "IconIndex" -void SvxHyperlinkNewDocTp::ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder ) -{ - // Open file - Config aCfg( rFile ); - aCfg.SetGroup( INTERNETSHORTCUT_ID_TAG ); - - // read URL - rURL = aCfg.ReadKey( ByteString( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_URL_TAG) ), RTL_TEXTENCODING_ASCII_US ); - SvtPathOptions aPathOpt; - rURL = aPathOpt.SubstituteVariable( rURL ); - - // read target - if ( pShowAsFolder ) - { - String aTemp( aCfg.ReadKey( ByteString( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_TARGET_TAG ) ), RTL_TEXTENCODING_ASCII_US ) ); - *pShowAsFolder = aTemp == String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_FOLDER_TAG ) ); - } - - // read image-ID - String aStrIconId( aCfg.ReadKey( ByteString( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_ICONID_TAG ) ), RTL_TEXTENCODING_ASCII_US ) ); - rIconId = aStrIconId.ToInt32(); - - // read title - String aLangStr = aPathOpt.SubstituteVariable( DEFINE_CONST_UNICODE("$(vlang)") ); - ByteString aLang( aLangStr, RTL_TEXTENCODING_UTF8 ); - ByteString aGroup = INTERNETSHORTCUT_ID_TAG; - ( ( aGroup += '-' ) += aLang ) += ".W"; - aCfg.SetGroup( aGroup ); - rTitle = String( aCfg.ReadKey( INTERNETSHORTCUT_TITLE_TAG ), RTL_TEXTENCODING_UTF7 ); -} - void SvxHyperlinkNewDocTp::FillDocumentList () { EnterWait(); diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src index 614c3a41b..85dc8111c 100644 --- a/cui/source/dialogs/hyperdlg.src +++ b/cui/source/dialogs/hyperdlg.src @@ -56,18 +56,21 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; RadioButton RB_LINKTYP_INTERNET { + HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET"; Pos = MAP_APPFONT( COL_2, 13 ); Size = MAP_APPFONT( 57, 10 ); Text [ en-US ] = "~Web"; }; RadioButton RB_LINKTYP_FTP { + HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP"; Pos = MAP_APPFONT( 114 + COL_DIFF, 13 ); Size = MAP_APPFONT( 56 - COL_DIFF, 10 ); Text [ en-US ] = "~FTP"; }; RadioButton RB_LINKTYP_TELNET { + HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET"; Pos = MAP_APPFONT( 173, 13 ); Size = MAP_APPFONT( 56, 10 ); Text [ en-US ] = "~Telnet"; @@ -86,6 +89,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; Edit ED_LOGIN { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 42 ) ; Size = MAP_APPFONT ( 80 - COL_DIFF , 12 ) ; @@ -98,6 +102,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; Edit ED_PASSWD { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 59 ) ; Size = MAP_APPFONT ( 80 - COL_DIFF , 12 ) ; @@ -105,6 +110,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; CheckBox CBX_ANONYMOUS { + HelpID = "cui:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS"; Pos = MAP_APPFONT ( COL_2 , 75 ) ; Size = MAP_APPFONT ( 89 - COL_DIFF , 10 ) ; TabStop = TRUE ; @@ -112,6 +118,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; ImageButton BTN_BROWSE { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE"; Pos = MAP_APPFONT ( 235, 24 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -131,6 +138,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; ImageButton BTN_TARGET { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET"; Pos = MAP_APPFONT ( 235, 40+2 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -162,6 +170,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; ComboBox CB_FRAME { + HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_INTERNET:CB_FRAME"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 104 ) ; Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ; @@ -177,6 +186,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; ListBox LB_FORM { + HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM"; Border = TRUE ; Pos = MAP_APPFONT ( 160 , 104 ) ; Size = MAP_APPFONT ( 70 , 60 ) ; @@ -198,6 +208,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; Edit ED_INDICATION { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 122 ) ; Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; @@ -210,12 +221,14 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; Edit ED_TEXT { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_TEXT"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 139 ) ; Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; }; ImageButton BTN_SCRIPT { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT"; Pos = MAP_APPFONT ( 235, 103-1 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -258,12 +271,14 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL }; RadioButton RB_LINKTYP_MAIL { + HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_MAIL"; Pos = MAP_APPFONT( COL_2, 13 ); Size = MAP_APPFONT( 56 - COL_DIFF, 10 ); Text [ en-US ] = "~E-mail"; }; RadioButton RB_LINKTYP_NEWS { + HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_NEWS"; Pos = MAP_APPFONT( 113, 13 ); Size = MAP_APPFONT( 56, 10 ); Text [ en-US ] = "~News"; @@ -282,12 +297,14 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL }; Edit ED_SUBJECT { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_SUBJECT"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 42 ) ; Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ; }; ImageButton BTN_ADRESSBOOK { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_ADRESSBOOK"; Pos = MAP_APPFONT ( 235, 24 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -321,6 +338,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL }; ComboBox CB_FRAME { + HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 104 ) ; Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ; @@ -336,6 +354,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL }; ListBox LB_FORM { + HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM"; Border = TRUE ; Pos = MAP_APPFONT ( 160 , 104 ) ; Size = MAP_APPFONT ( 70 , 60 ) ; @@ -357,6 +376,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL }; Edit ED_INDICATION { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 122 ) ; Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; @@ -369,12 +389,14 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL }; Edit ED_TEXT { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 139 ) ; Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; }; ImageButton BTN_SCRIPT { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT"; Pos = MAP_APPFONT ( 235, 103-1 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -422,6 +444,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; ImageButton BTN_FILEOPEN { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN"; Pos = MAP_APPFONT ( 235, 14 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -453,6 +476,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; Edit ED_TARGET_DOC { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 52 ) ; Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ; @@ -471,6 +495,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; ImageButton BTN_BROWSE { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE"; Pos = MAP_APPFONT ( 235, 51 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -502,6 +527,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; ComboBox CB_FRAME { + HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 104 ) ; Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ; @@ -517,6 +543,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; ListBox LB_FORM { + HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM"; Border = TRUE ; Pos = MAP_APPFONT ( 160 , 104 ) ; Size = MAP_APPFONT ( 70 , 60 ) ; @@ -538,6 +565,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; Edit ED_INDICATION { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 122 ) ; Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; @@ -550,12 +578,14 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; Edit ED_TEXT { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 139 ) ; Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; }; ImageButton BTN_SCRIPT { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT"; Pos = MAP_APPFONT ( 235, 103-1 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -597,12 +627,14 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; RadioButton RB_EDITNOW { + HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW"; Pos = MAP_APPFONT( COL_2, 13 ); Size = MAP_APPFONT( 85 - COL_DIFF, 10 ); Text [ en-US ] = "Edit ~now"; }; RadioButton RB_EDITLATER { + HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER"; Pos = MAP_APPFONT( 142, 13 ); Size = MAP_APPFONT( 84, 10 ); Text [ en-US ] = "Edit ~later"; @@ -615,6 +647,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; Edit ED_PATH_NEWDOC { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 25 ) ; Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ; @@ -627,6 +660,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; ListBox LB_DOCUMENT_TYPES { + HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 42 ) ; Size = MAP_APPFONT ( 176 - COL_DIFF , 40 ) ; @@ -635,6 +669,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; ImageButton BTN_CREATE { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE"; Pos = MAP_APPFONT ( 235, 24 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -667,6 +702,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; ComboBox CB_FRAME { + HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 104 ) ; Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ; @@ -682,6 +718,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; ListBox LB_FORM { + HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM"; Border = TRUE ; Pos = MAP_APPFONT ( 160 , 104 ) ; Size = MAP_APPFONT ( 70 , 60 ) ; @@ -703,6 +740,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; Edit ED_INDICATION { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 122 ) ; Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; @@ -715,12 +753,14 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; Edit ED_TEXT { + HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , 139 ) ; Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; }; ImageButton BTN_SCRIPT { + HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT"; Pos = MAP_APPFONT ( 235, 103-1 ) ; Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); TabStop = TRUE ; @@ -746,7 +786,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT *************************************************************************/ ModalDialog RID_SVXDLG_NEWHYPERLINK { - HelpID = SID_HYPERLINK_DIALOG; + HelpID = CMD_SID_HYPERLINK_DIALOG; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 325 , 185 ) ; diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src index f90048a61..0ad582520 100644 --- a/cui/source/dialogs/hyphen.src +++ b/cui/source/dialogs/hyphen.src @@ -54,6 +54,7 @@ ModalDialog RID_SVXDLG_HYPHENATE }; Edit ED_WORD { + HelpID = "cui:Edit:RID_SVXDLG_HYPHENATE:ED_WORD"; BORDER = TRUE ; Pos = MAP_APPFONT ( 5 , 17 ) ; Size = MAP_APPFONT ( 132 , 12 ) ; @@ -62,6 +63,7 @@ ModalDialog RID_SVXDLG_HYPHENATE }; ImageButton BTN_LEFT { + HelpID = "cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT"; Pos = MAP_APPFONT ( 56 , 33 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TABSTOP = TRUE ; @@ -69,6 +71,7 @@ ModalDialog RID_SVXDLG_HYPHENATE }; ImageButton BTN_RIGHT { + HelpID = "cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT"; Pos = MAP_APPFONT ( 75 , 33 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TABSTOP = TRUE ; @@ -84,6 +87,7 @@ ModalDialog RID_SVXDLG_HYPHENATE }; PushButton BTN_HYPH_CONTINUE { + HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE"; Pos = MAP_APPFONT ( 144 , 35 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Skip" ; @@ -91,6 +95,7 @@ ModalDialog RID_SVXDLG_HYPHENATE }; PushButton BTN_HYPH_DELETE { + HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE"; Pos = MAP_APPFONT ( 144 , 52 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Remove" ; @@ -109,6 +114,7 @@ ModalDialog RID_SVXDLG_HYPHENATE }; PushButton BTN_HYPH_ALL { + HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_ALL"; Pos = MAP_APPFONT ( 63 , 93 ) ; Size = MAP_APPFONT ( 74 , 14 ) ; Text [ en-US ] = "Hyphenate ~All" ; diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 2d0dab48f..a7b083880 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -149,56 +149,6 @@ sal_Bool IconChoicePage::QueryClose() /********************************************************************** | -| handling itemsets -| -\**********************************************************************/ - -const SfxPoolItem* IconChoicePage::GetItem( const SfxItemSet& rSet, - USHORT nSlot ) -{ - const SfxItemPool* pPool = rSet.GetPool(); - USHORT nWh = pPool->GetWhich( nSlot ); - const SfxPoolItem* pItem = 0; - rSet.GetItemState( nWh, TRUE, &pItem ); - - if ( !pItem && nWh != nSlot ) - pItem = &pPool->GetDefaultItem( nWh ); - - return pItem; -} - -// ----------------------------------------------------------------------- - -const SfxPoolItem* IconChoicePage::GetOldItem( const SfxItemSet& rSet, - USHORT nSlot ) -{ - const SfxItemSet& rOldSet = GetItemSet(); - USHORT nWh = GetWhich( nSlot ); - const SfxPoolItem* pItem = 0; - - if ( bStandard && rOldSet.GetParent() ) - pItem = GetItem( *rOldSet.GetParent(), nSlot ); - else if ( rSet.GetParent() && SFX_ITEM_DONTCARE == rSet.GetItemState( nWh ) ) - pItem = GetItem( *rSet.GetParent(), nSlot ); - else - pItem = GetItem( rOldSet, nSlot ); - - return pItem; -} - -// ----------------------------------------------------------------------- - -const SfxPoolItem* IconChoicePage::GetExchangeItem( const SfxItemSet& rSet, - USHORT nSlot ) -{ - if ( pDialog && !pDialog->IsInOK() && pDialog->GetExampleSet() ) - return GetItem( *pDialog->GetExampleSet(), nSlot ); - else - return GetOldItem( rSet, nSlot ); -} - -/********************************************************************** -| | window-methods | \**********************************************************************/ @@ -380,18 +330,6 @@ IconChoiceDialog ::~IconChoiceDialog () delete pData; } - // remove Pagelist -/* for ( i=0; i<maPageList.Count(); i++ ) - { - IconChoicePageData* pData = (IconChoicePageData*)maPageList.GetObject ( i ); - - if ( pData->bOnDemand ) - delete ( SfxItemSet * )&( pData->pPage->GetItemSet() ); - - delete pData->pPage; - delete pData; - }*/ - // remove Userdata from Icons for ( i=0; i<maIconCtrl.GetEntryCount(); i++) { @@ -415,26 +353,6 @@ IconChoiceDialog ::~IconChoiceDialog () SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& rIconText, const Image& rChoiceIcon, - CreatePage pCreateFunc /* != 0 */, - GetPageRanges pRangesFunc /* darf 0 sein */, - BOOL bItemsOnDemand, ULONG /*nPos*/ ) -{ - IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc, - pRangesFunc, - bItemsOnDemand ); - maPageList.Insert ( pData, LIST_APPEND ); - - pData->fnGetRanges = pRangesFunc; - pData->bOnDemand = bItemsOnDemand; - - USHORT *pId = new USHORT ( nId ); - SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon ); - pEntry->SetUserData ( (void*) pId ); - return pEntry; -} - -SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& rIconText, - const Image& rChoiceIcon, const Image& rChoiceIconHC, CreatePage pCreateFunc /* != 0 */, GetPageRanges pRangesFunc /* darf 0 sein */, @@ -456,65 +374,6 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& /********************************************************************** | -| remove page -| -\**********************************************************************/ - -void IconChoiceDialog::RemoveTabPage( USHORT nId ) -{ - IconChoicePageData* pData = GetPageData ( nId ); - - // remove page from list - if ( pData ) - { - maPageList.Remove ( pData ); - - // save settings - if ( pData->pPage ) - { - pData->pPage->FillUserData(); - String aPageData(pData->pPage->GetUserData()); - if ( aPageData.Len() ) - { - SvtViewOptions aTabPageOpt( E_TABPAGE, String::CreateFromInt32( pData->nId ) ); - - SetViewOptUserItem( aTabPageOpt, aPageData ); - } - } - - if ( pData->bOnDemand ) - delete ( SfxItemSet * )&( pData->pPage->GetItemSet() ); - - delete pData->pPage; - delete pData; - } - - // remove Icon - BOOL bFound=FALSE; - for ( ULONG i=0; i<maIconCtrl.GetEntryCount() && !bFound; i++) - { - SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i ); - USHORT* pUserData = (USHORT*) pEntry->GetUserData(); - - if ( *pUserData == nId ) - { - delete pUserData; - maIconCtrl.RemoveEntry ( pEntry ); - bFound = TRUE; - } - } - - // was it the current page ? - if ( nId == mnCurrentPageId ) - { - mnCurrentPageId = maPageList.First()->nId; - } - - Invalidate (); -} - -/********************************************************************** -| | Paint-method | \**********************************************************************/ @@ -572,13 +431,6 @@ EIconChoicePos IconChoiceDialog::SetCtrlPos( const EIconChoicePos& rPos ) return eOldPos; } -void IconChoiceDialog::SetCtrlColor ( const Color& rColor ) -{ - Wallpaper aWallpaper ( rColor ); - maIconCtrl.SetBackground( aWallpaper ); - maIconCtrl.SetFontColorToBackground (); -} - /********************************************************************** | | Show / Hide page or button @@ -601,14 +453,6 @@ void IconChoiceDialog::HidePageImpl ( IconChoicePageData* pData ) // ----------------------------------------------------------------------- -void IconChoiceDialog::RemoveResetButton() -{ - aResetBtn.Hide(); - bHideResetBtn = TRUE; -} - -// ----------------------------------------------------------------------- - void IconChoiceDialog::ShowPage( USHORT nId ) { bool bInvalidate = GetCurPageId() != nId; @@ -1144,40 +988,6 @@ void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet ) // ----------------------------------------------------------------------- -// Liefert die Pages, die ihre Sets onDemand liefern, das OutputItemSet. -const SfxItemSet* IconChoiceDialog::GetOutputItemSet ( USHORT nId ) -{ - IconChoicePageData * pData = GetPageData ( nId ); - DBG_ASSERT( pData, "TabPage nicht gefunden" ); - - if ( pData ) - { - if ( !pData->pPage ) - return NULL; - - if ( pData->bOnDemand ) - return &pData->pPage->GetItemSet(); - - return pOutSet; - } - - return NULL; -} - -// ----------------------------------------------------------------------- - -int IconChoiceDialog::FillOutputItemSet() -{ - int nRet = IconChoicePage::LEAVE_PAGE; - if ( OK_Impl() ) - Ok(); - else - nRet = IconChoicePage::KEEP_PAGE; - return nRet; -} - -// ----------------------------------------------------------------------- - void IconChoiceDialog::PageCreated( USHORT /*nId*/, IconChoicePage& /*rPage*/ ) { // not interested in @@ -1404,13 +1214,6 @@ short IconChoiceDialog::Ok() // ----------------------------------------------------------------------- -BOOL IconChoiceDialog::IsInOK() const -{ - return bInOK; -} - -// ----------------------------------------------------------------------- - void IconChoiceDialog::FocusOnIcon( USHORT nId ) { // set focus to icon for the current visible page @@ -1426,10 +1229,3 @@ void IconChoiceDialog::FocusOnIcon( USHORT nId ) } } } - -// ----------------------------------------------------------------------- - -void IconChoiceDialog::CreateIconTextAutoMnemonics( void ) -{ - maIconCtrl.CreateAutoMnemonics(); -} diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 48ae30ef9..741c48914 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -196,11 +196,6 @@ void SvInsertOleDlg::SelectDefault() aLbObjecttype.SelectEntryPos( 0 ); } -void SvInsertOleDlg::FillObjectServerList( SvObjectServerList* pList ) -{ - pList->FillInsertObjects(); -} - // ----------------------------------------------------------------------- SvInsertOleDlg::SvInsertOleDlg ( diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 7068074b9..aac403097 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -44,7 +44,7 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const return static_cast< sal_uInt16 >( aCountEdit.GetValue() ); } -SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId ) +SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const rtl::OString& sHelpId ) : ModalDialog( pParent, CUI_RES(DLG_INS_ROW_COL) ), aCount( this, CUI_RES( FT_COUNT ) ), aCountEdit( this, CUI_RES( ED_COUNT ) ), @@ -70,7 +70,7 @@ SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId ) aTmp += aRow; } SetText( aTmp ); - SetHelpId( nHelpId ); + SetHelpId( sHelpId ); } short SvxInsRowColDlg::Execute(void) diff --git a/cui/source/dialogs/insrc.src b/cui/source/dialogs/insrc.src index 6139dcd37..4ba5ebf1e 100644 --- a/cui/source/dialogs/insrc.src +++ b/cui/source/dialogs/insrc.src @@ -31,6 +31,7 @@ ModalDialog DLG_INS_ROW_COL { + HelpID = "cui:ModalDialog:DLG_INS_ROW_COL"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 136 , 84 ) ; @@ -57,6 +58,7 @@ ModalDialog DLG_INS_ROW_COL }; RadioButton CB_POS_BEFORE { + HelpID = "cui:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE"; Pos = MAP_APPFONT ( 12 , 49 ) ; Size = MAP_APPFONT ( 56 , 10 ) ; Text [ en-US ] = "~Before" ; @@ -64,6 +66,7 @@ ModalDialog DLG_INS_ROW_COL }; RadioButton CB_POS_AFTER { + HelpID = "cui:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER"; Pos = MAP_APPFONT ( 12 , 62 ) ; Size = MAP_APPFONT ( 56 , 10 ) ; Text [ en-US ] = "A~fter" ; @@ -72,6 +75,7 @@ ModalDialog DLG_INS_ROW_COL }; NumericField ED_COUNT { + HelpID = "cui:NumericField:DLG_INS_ROW_COL:ED_COUNT"; Border = TRUE ; Pos = MAP_APPFONT ( 44 , 14 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; diff --git a/cui/source/dialogs/multipat.src b/cui/source/dialogs/multipat.src index 45695d850..a7b56d501 100644 --- a/cui/source/dialogs/multipat.src +++ b/cui/source/dialogs/multipat.src @@ -47,6 +47,7 @@ ModalDialog RID_SVXDLG_MULTIPATH }; ListBox LB_MULTIPATH { + HelpID = "cui:ListBox:RID_SVXDLG_MULTIPATH:LB_MULTIPATH"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 189 , 80 ) ; @@ -70,12 +71,14 @@ ModalDialog RID_SVXDLG_MULTIPATH }; PushButton BTN_ADD_MULTIPATH { + HelpID = "cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH"; Pos = MAP_APPFONT ( 204 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Add..." ; }; PushButton BTN_DEL_MULTIPATH { + HelpID = "cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH"; Pos = MAP_APPFONT ( 204 , 31 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete" ; diff --git a/cui/source/dialogs/newtabledlg.src b/cui/source/dialogs/newtabledlg.src index 67e64254c..4ac627599 100644 --- a/cui/source/dialogs/newtabledlg.src +++ b/cui/source/dialogs/newtabledlg.src @@ -30,6 +30,7 @@ ModalDialog RID_SVX_NEWTABLE_DLG { + HelpID = "cui:ModalDialog:RID_SVX_NEWTABLE_DLG"; OutputSize = TRUE; SVLook = TRUE ; Moveable = TRUE ; @@ -44,6 +45,7 @@ ModalDialog RID_SVX_NEWTABLE_DLG }; NumericField NF_COLUMNS { + HelpID = "cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_COLUMNS"; Border = TRUE ; Pos = MAP_APPFONT ( 80 , 6 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -63,6 +65,7 @@ ModalDialog RID_SVX_NEWTABLE_DLG }; NumericField NF_ROWS { + HelpID = "cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_ROWS"; Border = TRUE ; Pos = MAP_APPFONT ( 80 , 6+15 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src index c05b45134..2542956da 100644 --- a/cui/source/dialogs/postdlg.src +++ b/cui/source/dialogs/postdlg.src @@ -27,12 +27,13 @@ // include --------------------------------------------------------------- #include <cuires.hrc> #include "postdlg.hrc" +#include "helpid.hrc" #include <svx/dialogs.hrc> // for RID_SVXDLG_POSTIT // RID_SVXDLG_POSTIT ----------------------------------------------------- ModalDialog RID_SVXDLG_POSTIT { - HelpId = SID_POSTIT ; + HelpId = HID_POSTIT_DIALOG ; OutputSize = TRUE ; SvLook = TRUE ; Size = MAP_APPFONT ( 198 , 134 ) ; @@ -60,6 +61,7 @@ ModalDialog RID_SVXDLG_POSTIT }; MultiLineEdit ED_EDIT { + HelpID = "cui:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 38 ) ; Size = MAP_APPFONT ( 123 , 72 ) ; @@ -92,12 +94,14 @@ ModalDialog RID_SVXDLG_POSTIT }; ImageButton BTN_PREV { + HelpID = "cui:ImageButton:RID_SVXDLG_POSTIT:BTN_PREV"; Pos = MAP_APPFONT ( 141 , 60 ) ; Size = MAP_APPFONT ( 24 , 14 ) ; Symbol = IMAGEBUTTON_ARROW_LEFT ; }; ImageButton BTN_NEXT { + HelpID = "cui:ImageButton:RID_SVXDLG_POSTIT:BTN_NEXT"; Pos = MAP_APPFONT ( 167 , 60 ) ; Size = MAP_APPFONT ( 24 , 14 ) ; Symbol = IMAGEBUTTON_ARROW_RIGHT ; @@ -110,6 +114,7 @@ ModalDialog RID_SVXDLG_POSTIT }; PushButton BTN_AUTHOR { + HelpID = "cui:PushButton:RID_SVXDLG_POSTIT:BTN_AUTHOR"; Pos = MAP_APPFONT ( 75 , 114 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Author" ; diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index ff1b07a60..efef9c7f0 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -367,15 +367,6 @@ void SFTreeListBox:: RequestSubEntries( SvLBoxEntry* pRootEntry, Reference< ::co } } -void SFTreeListBox::UpdateEntries() -{ -} - -SvLBoxEntry* SFTreeListBox::FindEntry( SvLBoxEntry* , const String& , BYTE ) -{ - return 0; -} - long SFTreeListBox::ExpandingHdl() { return TRUE; @@ -626,10 +617,6 @@ short SvxScriptOrgDialog::Execute() return nRet; } -void SvxScriptOrgDialog::EnableButton( Button& , BOOL ) -{ -} - void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node ) { if ( node.is() ) @@ -921,38 +908,6 @@ Reference< XModel > SvxScriptOrgDialog::getModel( SvLBoxEntry* pEntry ) return model; } -Reference< XInterface > -SvxScriptOrgDialog::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OUString& docName ) -{ - Reference< XInterface > xModel; - Reference< lang::XMultiComponentFactory > mcf = - xCtx->getServiceManager(); - Reference< frame::XDesktop > desktop ( - mcf->createInstanceWithContext( - ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx ), - UNO_QUERY ); - - Reference< container::XEnumerationAccess > componentsAccess = - desktop->getComponents(); - Reference< container::XEnumeration > components = - componentsAccess->createEnumeration(); - while (components->hasMoreElements()) - { - Reference< frame::XModel > model( - components->nextElement(), UNO_QUERY ); - if ( model.is() ) - { - ::rtl::OUString sTdocUrl = ::comphelper::DocumentInfo::getDocumentTitle( model ); - if( sTdocUrl.equals( docName ) ) - { - xModel = model; - break; - } - } - } - return xModel; -} - void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) { @@ -1371,28 +1326,6 @@ void SvxScriptOrgDialog::RestorePreviousSelection() aScriptsBox.SetCurEntry( pEntry ); } -BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1, - Reference< browse::XBrowseNode > node2 ) -{ - ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user"); - ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share"); - if( node1->getName().equals( userStr ) ) - return true; - if( node2->getName().equals( userStr ) ) - return false; - if( node1->getName().equals( shareStr ) ) - return true; - if( node2->getName().equals( shareStr ) ) - return false; - return dialogSort2( node1, node2 ); -} - -BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, - Reference< browse::XBrowseNode > node2 ) -{ - return ( node1->getName().compareTo( node2->getName() ) < 0 ); -} - ::rtl::OUString ReplaceString( const ::rtl::OUString& source, const ::rtl::OUString& token, diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src index 292c862fe..a157a28a3 100644 --- a/cui/source/dialogs/scriptdlg.src +++ b/cui/source/dialogs/scriptdlg.src @@ -106,6 +106,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER PushButton SF_PB_RUN { + HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN"; Pos = MAP_APPFONT ( 144 , 6 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; DefButton = TRUE; @@ -121,6 +122,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER PushButton SF_PB_CREATE { + HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE"; Size = MAP_APPFONT ( 60 , 14 ) ; Pos = MAP_APPFONT ( 144 , 60 ) ; Text [ en-US ] = "~Create..." ; @@ -128,6 +130,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER }; PushButton SF_PB_EDIT { + HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT"; Size = MAP_APPFONT ( 60 , 14 ) ; Pos = MAP_APPFONT ( 144 , 77 ) ; Text [ en-US ] = "~Edit" ; @@ -135,12 +138,14 @@ ModalDialog RID_DLG_SCRIPTORGANIZER }; PushButton SF_PB_RENAME { + HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME"; Pos = MAP_APPFONT ( 144 , 94 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Rename..." ; }; PushButton SF_PB_DEL { + HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL"; Pos = MAP_APPFONT ( 144 , 114 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Delete..." ; @@ -156,6 +161,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER }; ModalDialog RID_DLG_NEWLIB { + HelpID = "cui:ModalDialog:RID_DLG_NEWLIB"; Text [ en-US ] = "Create Library" ; Size = MAP_APPFONT ( 160 , 50 ) ; Moveable = TRUE ; @@ -182,6 +188,7 @@ ModalDialog RID_DLG_NEWLIB }; Edit ED_LIBNAME { + HelpID = "cui:Edit:RID_DLG_NEWLIB:ED_LIBNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 59 ) ; Size = MAP_APPFONT ( 92 , 12 ) ; diff --git a/cui/source/dialogs/showcols.src b/cui/source/dialogs/showcols.src index f4d124d17..556aa85d6 100644 --- a/cui/source/dialogs/showcols.src +++ b/cui/source/dialogs/showcols.src @@ -29,6 +29,7 @@ ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS { + HelpID = "cui:ModalDialog:RID_SVX_DLG_SHOWGRIDCOLUMNS"; OutputSize = TRUE; SVLook = TRUE ; Size = MAP_APPFONT( 200, 117 ); @@ -45,6 +46,7 @@ ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS ListBox 1 { + HelpID = "cui:ListBox:RID_SVX_DLG_SHOWGRIDCOLUMNS:1"; Border = TRUE; Pos = MAP_APPFONT( 6, 39 ); Size = MAP_APPFONT( 188, 55 ); diff --git a/cui/source/dialogs/splitcelldlg.src b/cui/source/dialogs/splitcelldlg.src index ea5cbc7d1..62ea4613e 100644 --- a/cui/source/dialogs/splitcelldlg.src +++ b/cui/source/dialogs/splitcelldlg.src @@ -30,6 +30,7 @@ ModalDialog RID_SVX_SPLITCELLDLG { + HelpID = "cui:ModalDialog:RID_SVX_SPLITCELLDLG"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 169 , 108 ) ; @@ -64,6 +65,7 @@ ModalDialog RID_SVX_SPLITCELLDLG }; NumericField ED_COUNT { + HelpID = "cui:NumericField:RID_SVX_SPLITCELLDLG:ED_COUNT"; Border = TRUE ; Pos = MAP_APPFONT ( 82 , 14 ) ; Size = MAP_APPFONT ( 21 , 12 ) ; @@ -85,6 +87,7 @@ ModalDialog RID_SVX_SPLITCELLDLG }; ImageRadioButton RB_HORZ { + HelpID = "cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_HORZ"; Pos = MAP_APPFONT ( 12 , 47 ) ; Size = MAP_APPFONT ( 90 , 18 ) ; Group = TRUE; @@ -98,6 +101,7 @@ ModalDialog RID_SVX_SPLITCELLDLG }; CheckBox CB_PROP { + HelpID = "cui:CheckBox:RID_SVX_SPLITCELLDLG:CB_PROP"; Pos = MAP_APPFONT ( 18 , 68 ) ; Size = MAP_APPFONT ( 91 , 12 ) ; Text [ en-US ] = "~Into equal proportions"; @@ -112,6 +116,7 @@ ModalDialog RID_SVX_SPLITCELLDLG }; ImageRadioButton RB_VERT { + HelpID = "cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_VERT"; Pos = MAP_APPFONT ( 12 , 84 ) ; Size = MAP_APPFONT ( 90 , 18 ) ; Text [ en-US ] = "~Vertically" ; diff --git a/cui/source/dialogs/srchxtra.src b/cui/source/dialogs/srchxtra.src index d18c3c4cf..15d9ac703 100644 --- a/cui/source/dialogs/srchxtra.src +++ b/cui/source/dialogs/srchxtra.src @@ -148,6 +148,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY }; NumericField NF_OTHER { + HelpID = "cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER"; Pos = MAP_APPFONT ( 86 , 14 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; Border = TRUE ; @@ -169,6 +170,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY }; NumericField NF_LONGER { + HelpID = "cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_LONGER"; Pos = MAP_APPFONT ( 86 , 28 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; Border = TRUE ; @@ -190,6 +192,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY }; NumericField NF_SHORTER { + HelpID = "cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_SHORTER"; Pos = MAP_APPFONT ( 86 , 44 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; Border = TRUE ; @@ -205,6 +208,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY }; CheckBox CB_RELAX { + HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHSIMILARITY:CB_RELAX"; Pos = MAP_APPFONT ( 12 , 60 ) ; Size = MAP_APPFONT ( 98 , 10 ) ; Text [ en-US ] = "~Combine" ; diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src index 5cb13c897..78c276f36 100644 --- a/cui/source/dialogs/svuidlg.src +++ b/cui/source/dialogs/svuidlg.src @@ -30,6 +30,7 @@ ModalDialog MD_PASTE_OBJECT { + HelpID = "cui:ModalDialog:MD_PASTE_OBJECT"; OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; @@ -49,6 +50,7 @@ ModalDialog MD_PASTE_OBJECT }; RadioButton RB_PASTE { + HelpID = "cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 48 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; @@ -57,6 +59,7 @@ ModalDialog MD_PASTE_OBJECT }; RadioButton RB_PASTE_LINK { + HelpID = "cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE_LINK"; Hide = TRUE ; Pos = MAP_APPFONT ( 78 , 48 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; @@ -64,12 +67,14 @@ ModalDialog MD_PASTE_OBJECT }; ListBox LB_INSERT_LIST { + HelpID = "cui:ListBox:MD_PASTE_OBJECT:LB_INSERT_LIST"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 49 ) ; Size = MAP_APPFONT ( 202 , 74 ) ; }; CheckBox CB_DISPLAY_AS_ICON { + HelpID = "cui:CheckBox:MD_PASTE_OBJECT:CB_DISPLAY_AS_ICON"; Hide = TRUE ; Disable = TRUE ; Pos = MAP_APPFONT ( 150 , 62 ) ; @@ -87,6 +92,7 @@ ModalDialog MD_PASTE_OBJECT */ PushButton PB_CHANGE_ICON { + HelpID = "cui:PushButton:MD_PASTE_OBJECT:PB_CHANGE_ICON"; Hide = TRUE ; Pos = MAP_APPFONT ( 150 , 111 ) ; Size = MAP_APPFONT ( 64 , 14 ) ; @@ -121,6 +127,7 @@ ModalDialog MD_PASTE_OBJECT }; ModalDialog MD_UPDATE_BASELINKS { + HelpID = "cui:ModalDialog:MD_UPDATE_BASELINKS"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 337 , 166 ) ; @@ -164,24 +171,28 @@ ModalDialog MD_UPDATE_BASELINKS }; PushButton PB_UPDATE_NOW { + HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_UPDATE_NOW"; Pos = MAP_APPFONT ( 270 , 43 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Update" ; }; PushButton PB_OPEN_SOURCE { + HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_OPEN_SOURCE"; Pos = MAP_APPFONT ( 270 , 60 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Open" ; }; PushButton PB_CHANGE_SOURCE { + HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE"; Pos = MAP_APPFONT ( 270 , 77 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Modify..." ; }; PushButton PB_BREAK_LINK { + HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_BREAK_LINK"; Pos = MAP_APPFONT ( 270 , 94 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Break Link" ; @@ -212,12 +223,14 @@ ModalDialog MD_UPDATE_BASELINKS }; RadioButton RB_AUTOMATIC { + HelpID = "cui:RadioButton:MD_UPDATE_BASELINKS:RB_AUTOMATIC"; Pos = MAP_APPFONT ( 70 , 150 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "~Automatic" ; }; RadioButton RB_MANUAL { + HelpID = "cui:RadioButton:MD_UPDATE_BASELINKS:RB_MANUAL"; Pos = MAP_APPFONT ( 133 , 150 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Manuell : Ma~nuell */ @@ -273,6 +286,7 @@ ModalDialog MD_UPDATE_BASELINKS }; ModalDialog MD_LINKEDIT { + HelpID = "cui:ModalDialog:MD_LINKEDIT"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 222 , 58 ) ; @@ -304,6 +318,7 @@ ModalDialog MD_LINKEDIT }; Edit ED_FULL_SOURCE_NAME { + HelpID = "cui:Edit:MD_LINKEDIT:ED_FULL_SOURCE_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 5 , 35 ) ; Size = MAP_APPFONT ( 155 , 12 ) ; @@ -312,42 +327,49 @@ ModalDialog MD_LINKEDIT }; ModalDialog MD_INSERT_OLEOBJECT { + HelpID = "cui:ModalDialog:MD_INSERT_OLEOBJECT"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 284 , 105 ) ; Moveable = TRUE ; RadioButton RB_NEW_OBJECT { + HelpID = "cui:RadioButton:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT"; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 81 , 10 ) ; Text [ en-US ] = "~Create new" ; }; RadioButton RB_OBJECT_FROMFILE { + HelpID = "cui:RadioButton:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE"; Pos = MAP_APPFONT ( 90 , 6 ) ; Size = MAP_APPFONT ( 81 , 10 ) ; Text [ en-US ] = "Create from ~file" ; }; ListBox LB_OBJECTTYPE { + HelpID = "cui:ListBox:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 33 ) ; Size = MAP_APPFONT ( 204 , 60 ) ; }; Edit ED_FILEPATH { + HelpID = "cui:Edit:MD_INSERT_OLEOBJECT:ED_FILEPATH"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 33 ) ; Size = MAP_APPFONT ( 204 , 12 ) ; }; PushButton BTN_FILEPATH { + HelpID = "cui:PushButton:MD_INSERT_OLEOBJECT:BTN_FILEPATH"; Pos = MAP_APPFONT ( 166 , 48 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Search..." ; }; CheckBox CB_FILELINK { + HelpID = "cui:CheckBox:MD_INSERT_OLEOBJECT:CB_FILELINK"; Pos = MAP_APPFONT ( 12 , 48 ) ; Size = MAP_APPFONT ( 138 , 10 ) ; Text [ en-US ] = "~Link to file" ; @@ -385,18 +407,21 @@ ModalDialog MD_INSERT_OLEOBJECT }; ModalDialog MD_INSERT_OBJECT_PLUGIN { + HelpID = "cui:ModalDialog:MD_INSERT_OBJECT_PLUGIN"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 284 , 123 ) ; Moveable = TRUE ; Edit ED_FILEURL { + HelpID = "cui:Edit:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 204 , 12 ) ; }; PushButton BTN_FILEURL { + HelpID = "cui:PushButton:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL"; Pos = MAP_APPFONT ( 166 , 29 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Browse..." ; @@ -409,6 +434,7 @@ ModalDialog MD_INSERT_OBJECT_PLUGIN }; MultiLineEdit ED_PLUGINS_OPTIONS { + HelpID = "cui:MultiLineEdit:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 66 ) ; Size = MAP_APPFONT ( 204 , 45 ) ; @@ -441,6 +467,7 @@ ModalDialog MD_INSERT_OBJECT_PLUGIN }; ModalDialog MD_INSERT_OBJECT_APPLET { + HelpID = "cui:ModalDialog:MD_INSERT_OBJECT_APPLET"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 284 , 164 ) ; @@ -453,6 +480,7 @@ ModalDialog MD_INSERT_OBJECT_APPLET }; Edit ED_CLASSFILE { + HelpID = "cui:Edit:MD_INSERT_OBJECT_APPLET:ED_CLASSFILE"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 204 , 12 ) ; @@ -465,12 +493,14 @@ ModalDialog MD_INSERT_OBJECT_APPLET }; Edit ED_CLASSLOCATION { + HelpID = "cui:Edit:MD_INSERT_OBJECT_APPLET:ED_CLASSLOCATION"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 55 ) ; Size = MAP_APPFONT ( 204 , 12 ) ; }; PushButton BTN_CLASS { + HelpID = "cui:PushButton:MD_INSERT_OBJECT_APPLET:BTN_CLASS"; Pos = MAP_APPFONT ( 166 , 70 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Search..." ; @@ -483,6 +513,7 @@ ModalDialog MD_INSERT_OBJECT_APPLET }; MultiLineEdit ED_APPLET_OPTIONS { + HelpID = "cui:MultiLineEdit:MD_INSERT_OBJECT_APPLET:ED_APPLET_OPTIONS"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 107 ) ; Size = MAP_APPFONT ( 204 , 45 ) ; @@ -524,6 +555,7 @@ Control TB_LINKS ModalDialog MD_INSERT_OBJECT_IFRAME { + HelpID = "cui:ModalDialog:MD_INSERT_OBJECT_IFRAME"; Size = MAP_APPFONT ( 302 , 98 ) ; Hide = TRUE ; Moveable = TRUE ; @@ -554,6 +586,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; Edit ED_FRAMENAME { + HelpID = "cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_FRAMENAME"; Border = TRUE ; Pos = MAP_APPFONT ( 45 , 6 ) ; Size = MAP_APPFONT ( 178 , 12 ) ; @@ -567,6 +600,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; Edit ED_URL { + HelpID = "cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_URL"; Border = TRUE ; Pos = MAP_APPFONT ( 45 , 24 ) ; Size = MAP_APPFONT ( 178 , 12 ) ; @@ -574,6 +608,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; PushButton BT_FILEOPEN { + HelpID = "cui:PushButton:MD_INSERT_OBJECT_IFRAME:BT_FILEOPEN"; Pos = MAP_APPFONT ( 226 , 24 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~..." ; @@ -581,6 +616,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; RadioButton RB_SCROLLINGON { + HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGON"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 54 , 10 ) ; @@ -588,6 +624,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; RadioButton RB_SCROLLINGOFF { + HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGOFF"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 66 ) ; Size = MAP_APPFONT ( 54 , 10 ) ; @@ -595,6 +632,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; RadioButton RB_SCROLLINGAUTO { + HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGAUTO"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 79 ) ; Size = MAP_APPFONT ( 54 , 10 ) ; @@ -608,6 +646,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; RadioButton RB_FRMBORDER_ON { + HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_ON"; TabStop = TRUE ; Pos = MAP_APPFONT ( 81 , 53 ) ; Size = MAP_APPFONT ( 42 , 10 ) ; @@ -615,6 +654,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; RadioButton RB_FRMBORDER_OFF { + HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_OFF"; TabStop = TRUE ; Pos = MAP_APPFONT ( 81 , 66 ) ; Size = MAP_APPFONT ( 42 , 10 ) ; @@ -639,6 +679,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; NumericField NM_MARGINWIDTH { + HelpID = "cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINWIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 167 , 54 ) ; Size = MAP_APPFONT ( 20 , 12 ) ; @@ -652,6 +693,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; CheckBox CB_MARGINWIDTHDEFAULT { + HelpID = "cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINWIDTHDEFAULT"; TabStop = TRUE ; Pos = MAP_APPFONT ( 190 , 56 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; @@ -665,6 +707,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; NumericField NM_MARGINHEIGHT { + HelpID = "cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINHEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 167 , 72 ) ; Size = MAP_APPFONT ( 20 , 12 ) ; @@ -678,6 +721,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME }; CheckBox CB_MARGINHEIGHTDEFAULT { + HelpID = "cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT"; TabStop = TRUE ; Pos = MAP_APPFONT ( 190 , 74 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; diff --git a/cui/source/dialogs/tbxform.src b/cui/source/dialogs/tbxform.src index a5f43aae6..8af5e3b0b 100644 --- a/cui/source/dialogs/tbxform.src +++ b/cui/source/dialogs/tbxform.src @@ -28,6 +28,7 @@ ModalDialog RID_SVX_DLG_INPUTRECORDNO { + HelpID = "cui:ModalDialog:RID_SVX_DLG_INPUTRECORDNO"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 130 , 45 ) ; @@ -43,6 +44,7 @@ ModalDialog RID_SVX_DLG_INPUTRECORDNO }; NumericField 1 { + HelpID = "cui:NumericField:RID_SVX_DLG_INPUTRECORDNO:1"; Border = TRUE ; Pos = MAP_APPFONT ( 79 , 6 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 752a84dac..c9a6738e7 100644..100755 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -57,6 +57,7 @@ #include <i18npool/mslangid.hxx> #include <comphelper/processfactory.hxx> #include <osl/file.hxx> +#include <svl/lngmisc.hxx> #include <stack> @@ -73,36 +74,6 @@ using ::rtl::OUString; #define A2S(x) String::CreateFromAscii( x ) - -// GetReplaceEditString ------------------------------- - -static void GetReplaceEditString( String &rText ) -{ - // The strings returned by the thesaurus saometimes have some - // explanation text put in between '(' and ')' or a trailing '*'. - // These parts should not be put in the ReplaceEdit Text that may get - // inserted into the document. Thus we strip them from the text. - - xub_StrLen nPos = rText.Search( sal_Unicode('(') ); - while (STRING_NOTFOUND != nPos) - { - xub_StrLen nEnd = rText.Search( sal_Unicode(')'), nPos ); - if (STRING_NOTFOUND != nEnd) - rText.Erase( nPos, nEnd-nPos+1 ); - else - break; - nPos = rText.Search( sal_Unicode('(') ); - } - - nPos = rText.Search( sal_Unicode('*') ); - if (STRING_NOTFOUND != nPos) - rText.Erase( nPos ); - - // remove any possible remaining ' ' that may confuse the thesaurus - // when it gets called with the text - rText.EraseLeadingAndTrailingChars( sal_Unicode(' ') ); -} - // class LookUpComboBox_Impl -------------------------------------------------- LookUpComboBox_Impl::LookUpComboBox_Impl( @@ -172,12 +143,21 @@ void ReplaceEdit_Impl::SetText( const XubString& rStr, const Selection& rNewSele // class ThesaurusAlternativesCtrl_Impl ---------------------------------- +AlternativesString_Impl::AlternativesString_Impl( + ThesaurusAlternativesCtrl_Impl &rControl, + SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ) : + // + SvLBoxString( pEntry, nFlags, rStr ), + m_rControlImpl( rControl ) +{ +} + void AlternativesString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, SvLBoxEntry* pEntry ) { - AlternativesUserData_Impl* pData = (AlternativesUserData_Impl*)pEntry->GetUserData(); + AlternativesExtraData* pData = m_rControlImpl.GetExtraData( pEntry ); Point aPos( rPos ); Font aOldFont( rDev.GetFont()); if (pData && pData->IsHeader()) @@ -207,14 +187,40 @@ ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl( ThesaurusAlternativesCtrl_Impl::~ThesaurusAlternativesCtrl_Impl() { - ClearUserData(); + ClearExtraData(); +} + + +void ThesaurusAlternativesCtrl_Impl::ClearExtraData() +{ + UserDataMap_t aEmpty; + m_aUserData.swap( aEmpty ); +} + + +void ThesaurusAlternativesCtrl_Impl::SetExtraData( + const SvLBoxEntry *pEntry, + const AlternativesExtraData &rData ) +{ + if (!pEntry) + return; + + UserDataMap_t::iterator aIt( m_aUserData.find( pEntry ) ); + if (aIt != m_aUserData.end()) + aIt->second = rData; + else + m_aUserData[ pEntry ] = rData; } -void ThesaurusAlternativesCtrl_Impl::ClearUserData() +AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData( + const SvLBoxEntry *pEntry ) { - for (USHORT i = 0; i < GetEntryCount(); ++i) - delete (AlternativesUserData_Impl*)GetEntry(i)->GetUserData(); + AlternativesExtraData *pRes = NULL; + UserDataMap_t::iterator aIt( m_aUserData.find( pEntry ) ); + if (aIt != m_aUserData.end()) + pRes = &aIt->second; + return pRes; } @@ -230,10 +236,9 @@ SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const St pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) ); // add empty column aText += rText; pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0 ) ); // otherwise crash - pEntry->AddItem( new AlternativesString_Impl( pEntry, 0, aText ) ); + pEntry->AddItem( new AlternativesString_Impl( *this, pEntry, 0, aText ) ); - AlternativesUserData_Impl* pUserData = new AlternativesUserData_Impl( rText, bIsHeader ); - pEntry->SetUserData( pUserData ); + SetExtraData( pEntry, AlternativesExtraData( rText, bIsHeader ) ); GetModel()->Insert( pEntry ); if (bIsHeader) @@ -365,7 +370,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() m_pAlternativesCT->SetUpdateMode( FALSE ); // clear old user data of control before creating new ones via AddEntry below - m_pAlternativesCT->ClearUserData(); + m_pAlternativesCT->ClearExtraData(); m_pAlternativesCT->Clear(); for (sal_Int32 i = 0; i < nMeanings; ++i) @@ -454,7 +459,7 @@ IMPL_LINK( SvxThesaurusDialog_Impl, WordSelectHdl_Impl, ComboBox *, pBox ) { USHORT nPos = pBox->GetSelectEntryPos(); String aStr( pBox->GetEntry( nPos ) ); - GetReplaceEditString( aStr ); + aStr = linguistic::GetThesaurusReplaceText( aStr ); aWordCB.SetText( aStr ); LookUp_Impl(); } @@ -468,12 +473,12 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl, SvxCheckListBox SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL; if (pEntry) { - AlternativesUserData_Impl * pData = (AlternativesUserData_Impl *) pEntry->GetUserData(); + AlternativesExtraData * pData = m_pAlternativesCT->GetExtraData( pEntry ); String aStr; - if (!pData->IsHeader()) + if (pData && !pData->IsHeader()) { aStr = pData->GetText(); - GetReplaceEditString( aStr ); + aStr = linguistic::GetThesaurusReplaceText( aStr ); } aReplaceEdit.SetText( aStr ); } @@ -486,12 +491,12 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckLis SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL; if (pEntry) { - AlternativesUserData_Impl * pData = (AlternativesUserData_Impl *) pEntry->GetUserData(); + AlternativesExtraData * pData = m_pAlternativesCT->GetExtraData( pEntry ); String aStr; - if (!pData->IsHeader()) + if (pData && !pData->IsHeader()) { aStr = pData->GetText(); - GetReplaceEditString( aStr ); + aStr = linguistic::GetThesaurusReplaceText( aStr ); } aWordCB.SetText( aStr ); @@ -509,8 +514,8 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckLis IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, SelectFirstHdl_Impl, SvxCheckListBox *, pBox ) { (void) pThis; - if (pBox && pBox->GetEntryCount() > 0) - pBox->SelectEntryPos( 0 ); + if (pBox && pBox->GetEntryCount() >= 2) + pBox->SelectEntryPos( 1 ); // pos 0 is a 'header' that is not selectable return 0; } diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src index e96406f8e..5ccf36317 100644 --- a/cui/source/dialogs/thesdlg.src +++ b/cui/source/dialogs/thesdlg.src @@ -34,7 +34,7 @@ // RID_SVXDLG_THES ------------------------------------------------------- ModalDialog RID_SVXDLG_THESAURUS { - HelpId = SID_THESAURUS ; + HelpId = CMD_SID_THESAURUS ; OutputSize = TRUE ; Size = MAP_APPFONT ( 235, 230 ) ; Text [ en-US ] = "Thesaurus" ; @@ -50,6 +50,7 @@ ModalDialog RID_SVXDLG_THESAURUS ImageButton BTN_LEFT { + HelpID = "cui:ImageButton:RID_SVXDLG_THESAURUS:BTN_LEFT"; Pos = MAP_APPFONT ( 5 , 15 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TABSTOP = TRUE ; @@ -59,17 +60,19 @@ ModalDialog RID_SVXDLG_THESAURUS { Pos = MAP_APPFONT ( 24 , 5 ) ; Size = MAP_APPFONT ( 143 , 8 ) ; - Text [ en-US ] = "Current ~word" ; + Text [ en-US ] = "~Current word" ; LEFT = TRUE ; }; ComboBox CB_WORD { + HelpID = "cui:ComboBox:RID_SVXDLG_THESAURUS:CB_WORD"; DropDown = TRUE ; Pos = MAP_APPFONT ( 24 , 16 ) ; Size = MAP_APPFONT ( 141 , 60 ) ; // have drop down space for several lines }; MenuButton MB_LANGUAGE { + HelpID = "cui:MenuButton:RID_SVXDLG_THESAURUS:MB_LANGUAGE"; Pos = MAP_APPFONT ( 170 , 16 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Language" ; @@ -95,11 +98,12 @@ ModalDialog RID_SVXDLG_THESAURUS { Pos = MAP_APPFONT ( 5 , 173 ) ; Size = MAP_APPFONT ( 255 , 8 ) ; - Text [ en-US ] = "Replace ~with" ; + Text [ en-US ] = "~Replace with" ; LEFT = TRUE ; }; Edit ED_REPL { + HelpID = "cui:Edit:RID_SVXDLG_THESAURUS:ED_REPL"; BORDER = TRUE ; Pos = MAP_APPFONT ( 5 , 184 ) ; Size = MAP_APPFONT ( 225 , 12 ) ; @@ -120,7 +124,7 @@ ModalDialog RID_SVXDLG_THESAURUS { Pos = MAP_APPFONT ( 105 , 210 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; - Text [ en-US ] = "~Replace" ; + Text [ en-US ] = "Replace" ; DefButton = TRUE ; }; CancelButton BTN_THES_CANCEL diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index cc10964c4..d92039e7a 100644..100755 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -51,11 +51,16 @@ #include <com/sun/star/linguistic2/XMeaning.hpp> #include <stack> +#include <map> #include <algorithm> using namespace ::com::sun::star; using ::rtl::OUString; +class SvLBoxEntry; +class ThesaurusAlternativesCtrl_Impl; + + // class LookUpComboBox_Impl -------------------------------------------------- class LookUpComboBox_Impl : public ComboBox @@ -105,17 +110,14 @@ public: // class ThesaurusAlternativesCtrl_Impl ---------------------------------- -class AlternativesUserData_Impl +class AlternativesExtraData { String sText; bool bHeader; - // disable copy c-tor and assignment operator - AlternativesUserData_Impl( const AlternativesUserData_Impl & ); - AlternativesUserData_Impl & operator = ( const AlternativesUserData_Impl & ); - public: - AlternativesUserData_Impl( const String &rText, bool bIsHeader ) : + AlternativesExtraData() : bHeader( false ) {} + AlternativesExtraData( const String &rText, bool bIsHeader ) : sText(rText), bHeader(bIsHeader) { @@ -128,10 +130,11 @@ public: class AlternativesString_Impl : public SvLBoxString { + ThesaurusAlternativesCtrl_Impl & m_rControlImpl; public: - AlternativesString_Impl( SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ) - : SvLBoxString( pEntry, nFlags, rStr ) {} + AlternativesString_Impl( ThesaurusAlternativesCtrl_Impl &rControl, + SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ); virtual void Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, SvLBoxEntry* pEntry); }; @@ -142,6 +145,9 @@ class ThesaurusAlternativesCtrl_Impl : { SvxThesaurusDialog_Impl & m_rDialogImpl; + typedef std::map< const SvLBoxEntry *, AlternativesExtraData > UserDataMap_t; + UserDataMap_t m_aUserData; + // disable copy c-tor and assignment operator ThesaurusAlternativesCtrl_Impl( const ThesaurusAlternativesCtrl_Impl & ); ThesaurusAlternativesCtrl_Impl & operator = ( const ThesaurusAlternativesCtrl_Impl & ); @@ -152,7 +158,10 @@ public: SvLBoxEntry * AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader ); - void ClearUserData(); + + void ClearExtraData(); + void SetExtraData( const SvLBoxEntry *pEntry, const AlternativesExtraData &rData ); + AlternativesExtraData * GetExtraData( const SvLBoxEntry *pEntry ); virtual void KeyInput( const KeyEvent& rKEvt ); virtual void Paint( const Rectangle& rRect ); diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 0c15cff54..e6e8fdf6c 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -58,13 +58,6 @@ // static ---------------------------------------------------------------- -static USHORT pRanges[] = -{ - SID_ATTR_ZOOM, - SID_ATTR_ZOOM, - 0 -}; - #define SPECIAL_FACTOR ((USHORT)0xFFFF) // class SvxZoomDialog --------------------------------------------------- @@ -124,29 +117,6 @@ void SvxZoomDialog::SetFactor( USHORT nNewFactor, USHORT nBtnId ) // ----------------------------------------------------------------------- -void SvxZoomDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt ) -{ - switch ( nBtnId ) - { - case ZOOMBTN_OPTIMAL: // Optimal-Button - aOptimalBtn.SetText( rNewTxt ); - break; - - case ZOOMBTN_PAGEWIDTH: // Seitenbreite-Button - aPageWidthBtn.SetText( rNewTxt ); - break; - - case ZOOMBTN_WHOLEPAGE: // Ganze Seite-Button - aWholePageBtn.SetText( rNewTxt ); - break; - - default: - DBG_ERROR( "wrong button number" ); - } -} - -// ----------------------------------------------------------------------- - void SvxZoomDialog::HideButton( USHORT nBtnId ) { switch ( nBtnId ) @@ -181,13 +151,6 @@ void SvxZoomDialog::SetLimits( USHORT nMin, USHORT nMax ) // ----------------------------------------------------------------------- -void SvxZoomDialog::SetSpinSize( USHORT nNewSpin ) -{ - aUserEdit.SetSpinSize( nNewSpin ); -} - -// ----------------------------------------------------------------------- - SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_ZOOM ) ), @@ -218,7 +181,7 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : { #if ENABLE_LAYOUT - SetHelpId (SID_ATTR_ZOOM); + SetHelpId (".uno:Zoom"); #endif /* ENABLE_LAYOUT */ Link aLink = LINK( this, SvxZoomDialog, UserHdl ); a100Btn.SetClickHdl( aLink ); @@ -370,13 +333,6 @@ SvxZoomDialog::~SvxZoomDialog() // ----------------------------------------------------------------------- -USHORT* SvxZoomDialog::GetRanges() -{ - return pRanges; -} - -// ----------------------------------------------------------------------- - IMPL_LINK( SvxZoomDialog, UserHdl, RadioButton *, pBtn ) { bModified |= TRUE; diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src index 54b995f3d..9224f87fe 100644 --- a/cui/source/dialogs/zoom.src +++ b/cui/source/dialogs/zoom.src @@ -28,11 +28,12 @@ #include <cuires.hrc> #include "zoom.hrc" #include <svx/dialogs.hrc> // for RID_SVXDLG_ZOOM +#include "helpid.hrc" // RID_SVXDLG_ZOOM ------------------------------------------------------- ModalDialog RID_SVXDLG_ZOOM { - HelpId = SID_ATTR_ZOOM ; + HelpId = CMD_SID_ATTR_ZOOM; OutputSize = TRUE ; SvLook = TRUE ; Size = MAP_APPFONT ( 242 , 112 ) ; @@ -46,36 +47,42 @@ ModalDialog RID_SVXDLG_ZOOM }; RadioButton BTN_OPTIMAL { + HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "~Optimal" ; }; RadioButton BTN_WHOLE_PAGE { + HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "~Fit width and height" ; }; RadioButton BTN_PAGE_WIDTH { + HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH"; Pos = MAP_APPFONT ( 12 , 40 ) ; Size = MAP_APPFONT ( 105, 10 ) ; Text [ en-US ] = "Fit ~width" ; }; RadioButton BTN_100 { + HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100"; Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 105, 10 ) ; Text = "~100 %" ; }; RadioButton BTN_USER { + HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER"; Pos = MAP_APPFONT ( 12 , 67 ) ; Size = MAP_APPFONT ( 72 , 10 ) ; Text [ en-US ] = "~Variable" ; }; MetricField ED_USER { + HelpID = "cui:MetricField:RID_SVXDLG_ZOOM:ED_USER"; Pos = MAP_APPFONT ( 86 , 66 ) ; Size = MAP_APPFONT ( 32 , 12 ) ; Border = TRUE ; @@ -95,24 +102,28 @@ ModalDialog RID_SVXDLG_ZOOM }; RadioButton BTN_AUTOMATIC { + HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_AUTOMATIC"; Pos = MAP_APPFONT ( 130 , 14 ) ; Size = MAP_APPFONT ( 106 , 10 ) ; Text [ en-US ] = "~Automatic" ; }; RadioButton BTN_SINGLE { + HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_SINGLE"; Pos = MAP_APPFONT ( 130, 27 ) ; Size = MAP_APPFONT ( 106, 10 ) ; Text [ en-US ] = "~Single page" ; }; RadioButton BTN_COLUMNS { + HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_COLUMNS"; Pos = MAP_APPFONT ( 130, 41 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; Text [ en-US ] = "~Columns" ; }; MetricField ED_COLUMNS { + HelpID = "cui:MetricField:RID_SVXDLG_ZOOM:ED_COLUMNS"; Pos = MAP_APPFONT ( 209 , 40 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; Border = TRUE ; @@ -126,6 +137,7 @@ ModalDialog RID_SVXDLG_ZOOM }; CheckBox CHK_BOOK { + HelpID = "cui:CheckBox:RID_SVXDLG_ZOOM:CHK_BOOK"; Pos = MAP_APPFONT ( 136 , 55 ) ; Size = MAP_APPFONT ( 85 , 10 ) ; Text [ en-US ] = "~Book mode" ; diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 7a5a3a7b0..0a48dcfc3 100755..100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -725,13 +725,13 @@ void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link& rLink, bool bCheck else pDlg->SetCheckNameHdl( Link(), bCheckImmediately ); } -void AbstractSvxNameDialog_Impl::SetEditHelpId(ULONG nHelpId) +void AbstractSvxNameDialog_Impl::SetEditHelpId(const rtl::OString& aHelpId) { - pDlg->SetEditHelpId( nHelpId ); + pDlg->SetEditHelpId( aHelpId ); } -void AbstractSvxNameDialog_Impl::SetHelpId( ULONG nHelpId ) +void AbstractSvxNameDialog_Impl::SetHelpId( const rtl::OString& aHelpId ) { - pDlg->SetHelpId( nHelpId ); + pDlg->SetHelpId( aHelpId ); } void AbstractSvxNameDialog_Impl::SetText( const XubString& rStr ) { @@ -843,9 +843,9 @@ void AbstractSvxMultiFileDialog_Impl::SetTitle( const String& rNewTitle ) pDlg->SetText( rNewTitle ); } -void AbstractSvxMultiFileDialog_Impl::SetHelpId( ULONG nHelpId ) +void AbstractSvxMultiFileDialog_Impl::SetHelpId( const rtl::OString& aHelpId ) { - pDlg->SetHelpId( nHelpId ); + pDlg->SetHelpId( aHelpId ); } Window * AbstractSvxHpLinkDlg_Impl::GetWindow() @@ -1888,47 +1888,41 @@ GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( USHORT nId ) return 0; } -SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, USHORT nSlotId, +SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand, const Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList ) { InsertObjectDialog_Impl* pDlg=0; - switch ( nSlotId ) - { - case SID_INSERT_OBJECT : pDlg = new SvInsertOleDlg( pParent, xStor, pList ); break; - case SID_INSERT_PLUGIN : pDlg = new SvInsertPlugInDialog( pParent, xStor ); break; - case SID_INSERT_APPLET : pDlg = new SvInsertAppletDialog( pParent, xStor ); break; - case SID_INSERT_FLOATINGFRAME : pDlg = new SfxInsertFloatingFrameDialog( pParent, xStor ); break; - default: break; - } + if ( rCommand.equalsAscii(".uno:InsertObject" ) ) + pDlg = new SvInsertOleDlg( pParent, xStor, pList ); + else if ( rCommand.equalsAscii(".uno:InsertPlugin" ) ) + pDlg = new SvInsertPlugInDialog( pParent, xStor ); + else if ( rCommand.equalsAscii(".uno:InsertObjectFloatingFrame" ) ) + pDlg = new SfxInsertFloatingFrameDialog( pParent, xStor ); if ( pDlg ) { - pDlg->SetHelpId( nSlotId ); + pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) ); return new AbstractInsertObjectDialog_Impl( pDlg ); } return 0; } -VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, USHORT nSlotId, +VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand, const Reference < com::sun::star::embed::XEmbeddedObject >& xObj ) { InsertObjectDialog_Impl* pDlg=0; - switch ( nSlotId ) - { - case SID_INSERT_APPLET : pDlg = new SvInsertAppletDialog( pParent, xObj ); break; - case SID_INSERT_FLOATINGFRAME : pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj ); break; - default: break; - } - - if ( pDlg ) + if ( rCommand.equalsAscii(".uno:InsertObjectFloatingFrame" ) ) { - pDlg->SetHelpId( nSlotId ); + pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj ); + pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) ); return new VclAbstractDialog_Impl( pDlg ); } return 0; } + + SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( Window* pParent ) { return new AbstractPasteDialog_Impl( new SvPasteObjectDialog( pParent ) ); @@ -1963,9 +1957,9 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateOptionsDialog( return new VclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) ); } -SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ) +SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ) { - return new SvxInsRowColDlg( pParent, bCol, nHelpId ); + return new SvxInsRowColDlg( pParent, bCol, sHelpId ); } AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog( diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 41e80068d..12ce93d5c 100755..100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -235,24 +235,6 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog virtual SfxBindings& GetBindings(); }; -//for SvxSpellCheckDialog begin -//STRIP001 class AbstractSvxSpellCheckDialog_Impl : public AbstractSvxSpellCheckDialog //add for FmShowColsDialog -//STRIP001 { -//STRIP001 SvxSpellCheckDialog * pDlg; -//STRIP001 public -//STRIP001 AbstractSvxSpellCheckDialog_Impl ( SvxSpellCheckDialog* p) -//STRIP001 : pDlg(p) -//STRIP001 {} -//STRIP001 virtual USHORT Execute() ; -//STRIP001 virtual void SetNewEditWord( const String& _rNew ) ; -//STRIP001 virtual void SetLanguage( sal_uInt16 nLang ) ; -//STRIP001 virtual void HideAutoCorrect() ; -//STRIP001 virtual String GetNewEditWord(); -//STRIP001 virtual void SetNewEditWord( const String& _rNew ); -//STRIP001 } -//for SvxSpellCheckDialog end - - //for SearchProgress begin class SearchProgress; class AbstractSearchProgress_Impl : public AbstractSearchProgress @@ -414,9 +396,9 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog DECL_ABSTDLG_BASE(AbstractSvxNameDialog_Impl,SvxNameDialog) virtual void GetName( String& rName ) ; virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) ; - virtual void SetEditHelpId(ULONG nHelpId) ; + virtual void SetEditHelpId(const rtl::OString&) ; //from class Window - virtual void SetHelpId( ULONG nHelpId ) ; + virtual void SetHelpId( const rtl::OString& ) ; virtual void SetText( const XubString& rStr ) ; private: Link aCheckNameHdl; @@ -486,7 +468,7 @@ class AbstractSvxMultiFileDialog_Impl :public AbstractSvxMultiFileDialog virtual void EnableRadioButtonMode(); virtual void SetTitle( const String& rNewTitle ); //From Class Window - virtual void SetHelpId( ULONG nHelpId ) ; + virtual void SetHelpId( const rtl::OString& ) ; }; //for SvxMultiFileDialog end @@ -649,10 +631,10 @@ public: const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); - virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, USHORT nSlotId, + virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommmand, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList = 0 ); - virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, USHORT nSlotId, + virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommmand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ); virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent ); virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p=0 ); @@ -808,7 +790,7 @@ public: virtual VclAbstractDialog* CreateOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId, const rtl::OUString& rApplicationContext ); - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ); + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ); virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ); }; diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index c7315e803..99b0291f1 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -184,9 +184,7 @@ private: String GetLabel4Command(const String& sCommand); void InitAccCfg(); - KeyCode MapPosToKeyCode( USHORT nPos ) const; USHORT MapKeyCodeToPos( const KeyCode &rCode ) const; - String GetFunctionName( KeyFuncType eType ) const; css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const String& sName); void StartFileDialog( WinBits nBits, const String& rTitle ); @@ -202,10 +200,7 @@ public: virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); - void SelectMacro(const SfxMacroInfoItem*); void Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr); - void CopySource2Target(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xSourceAccMgr, - const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xTargetAccMgr); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); }; @@ -223,50 +218,6 @@ public: void ExpandEntry ( USHORT nPos, const String &rStr ); }; -/* -// class USHORTArr ********************************************************** - -DECL_2BYTEARRAY(USHORTArr, USHORT, 10, 10) - -// class SfxAcceleratorConfigDialog ************************************************** - -class SfxAcceleratorConfigDialog : public ModalDialog -{ - OKButton aOKButton; - CancelButton aCancelButton; - PushButton aChangeButton; - PushButton aRemoveButton; - SfxAcceleratorConfigListBox aEntriesBox; - FixedText aDescriptionTextText; - FixedText aDescriptionInfoText; - FixedLine aKeyboardGroup; - FixedText aGroupText; - ListBox aGroupLBox; - FixedText aFunctionText; - ListBox aFunctionBox; - FixedText aKeyText; - ListBox aKeyBox; - FixedLine aFunctionsGroup; - - USHORTArr aAccelArr; - USHORTArr aFunctionArr; - USHORTArr aKeyArr; - - void OKHdl ( Button * ); - void ChangeHdl( Button * ); - void RemoveHdl( Button * ); - void SelectHdl( ListBox *pListBox ); - - KeyCode PosToKeyCode ( USHORT nPos ) const; - USHORT KeyCodeToPos ( const KeyCode &rCode ) const; - String GetFunctionName( KeyFuncType eType ) const; - -public: - - SfxAcceleratorConfigDialog( Window *pParent ); -}; -*/ - class SvxShortcutAssignDlg : public SfxSingleTabDialog { public: diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 9ddade3b3..bbcd5121a 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -75,8 +75,6 @@ public: SvxConfigDialog( Window*, const SfxItemSet* ); ~SvxConfigDialog(); - void ActivateTabPage( USHORT ); - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); virtual short Ok(); @@ -258,12 +256,6 @@ private: public: - SvxConfigEntry( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& rProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameAccess >& rCommandToLabelMap ); - SvxConfigEntry( const ::rtl::OUString& rDisplayName, const ::rtl::OUString& rCommandURL, bool bPopup = FALSE, @@ -337,11 +329,6 @@ public: sal_Int32 GetStyle() { return nStyle; } void SetStyle( sal_Int32 style ) { nStyle = style; } - - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > - GetProperties( - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameAccess >& rCommandToLabelMap ); }; class SvxMenuEntriesListBox : public SvTreeListBox @@ -694,7 +681,6 @@ public: void RestoreToolbar( SvxConfigEntry* pToolbar ); void RemoveToolbar( SvxConfigEntry* pToolbar ); void ApplyToolbar( SvxConfigEntry* pToolbar ); - void ReloadToolbar( const rtl::OUString& rURL ); rtl::OUString GetSystemUIName( const rtl::OUString& rResourceURL ); @@ -744,7 +730,7 @@ public: aBtnOK.Enable( rLink.Call( this ) > 0 ); } - void SetEditHelpId(ULONG nHelpId) {aEdtName.SetHelpId(nHelpId);} + void SetEditHelpId( const rtl::OString& aHelpId) {aEdtName.SetHelpId(aHelpId);} }; class SvxIconSelectorDialog : public ModalDialog diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index e31303011..705edb0c6 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -139,12 +139,8 @@ public: ~SfxConfigFunctionListBox_Impl(); void ClearAll(); - SvLBoxEntry* GetEntry_Impl( USHORT nId ); - SvLBoxEntry* GetEntry_Impl( const String& ); - USHORT GetId( SvLBoxEntry *pEntry ); using Window::GetHelpText; String GetHelpText( SvLBoxEntry *pEntry ); - USHORT GetCurId() { return GetId( FirstSelected() ); } String GetCurCommand(); String GetCurLabel(); SfxMacroInfo* GetMacroInfo(); @@ -173,7 +169,6 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName ); - ::rtl::OUString parseLocationName( const ::rtl::OUString& location ); void InitModule(); void InitBasic(); diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 53a59dfb9..5d58f31eb 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -155,7 +155,6 @@ private: void Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ); BOOL FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ); void ResetColor_Impl( const SfxItemSet& rSet ); - BOOL FillItemSetColor_Impl( SfxItemSet& rSet ); DECL_LINK( UpdateHdl_Impl, Timer* ); DECL_LINK( FontModifyHdl_Impl, void* ); diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index 833d27a27..58ca9d8f9 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -67,7 +67,6 @@ public: virtual void Activate(); INT32 GetTransliterationFlags() const; - void SetTransliterationFlags( INT32 nSettings ); }; #endif diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 3cccde182..a57e492db 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -95,13 +95,6 @@ namespace svx */ void openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvLBoxEntry* _pEntry = NULL); - /** opens a file pciker to select a database file - @param _sLocation - If set, the file picker use it as default directory - @return - the location of the database file - */ - String getFileLocation(const String& _sLocation); #endif public: diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 0df32f85a..77bd8fbd4 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -91,7 +91,7 @@ public: aBtnOK.Enable( rLink.Call( this ) > 0 ); } - void SetEditHelpId(ULONG nHelpId) {aEdtName.SetHelpId(nHelpId);} + void SetEditHelpId( const rtl::OString& aHelpId) {aEdtName.SetHelpId(aHelpId);} }; /////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index cc9f8223f..d41d89a1a 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -152,7 +152,6 @@ namespace svx void SetIgnoreAllHdl( const Link& _rHdl ); void SetChangeHdl( const Link& _rHdl ); void SetChangeAllHdl( const Link& _rHdl ); - void SetOptionsHdl( const Link& _rHdl ); void SetClickByCharacterHdl( const Link& _rHdl ); void SetConversionFormatChangedHdl( const Link& _rHdl ); @@ -174,8 +173,6 @@ namespace svx editeng::HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const; void SetByCharacter( sal_Bool _bByCharacter ); - sal_Bool GetByCharacter( ) const; - void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); // should text which does not match the primary conversion direction be ignored? diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 5b25f37fd..4c19514e1 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -28,373 +28,363 @@ #define _CUI_HELPID_HRC // include --------------------------------------------------------------- -#include <svl/solar.hrc> +#include <svx/svxcommands.h> +#include <sfx2/sfxcommands.h> // Help-Ids -------------------------------------------------------------- -#define HID_OPTIONS_COLOR (HID_CUI_START + 1) -#define HID_OPTIONS_SAVE (HID_CUI_START + 2) -#define HID_OPTIONS_PATH (HID_CUI_START + 3) -#define HID_OPTIONS_GENERAL (HID_CUI_START + 4) -#define HID_OPTIONS_LINGU (HID_CUI_START + 5) -#define HID_OPTIONS_SPELL (HID_CUI_START + 6) -#define HID_OPTIONS_DICT_NEW (HID_CUI_START + 7) -#define HID_OPTIONS_DICT_EDIT (HID_CUI_START + 8) -#define HID_OPTIONS_INET (HID_CUI_START + 9) -#define HID_OPTIONS_CHART_DEFCOLORS (HID_CUI_START + 10) -#define HID_OPTIONS_CTL (HID_CUI_START + 11) -#define HID_OPTIONS_PROXY (HID_CUI_START + 12) -#define HID_OPTIONS_SEARCH (HID_CUI_START + 13) -#define HID_OPTIONS_MAIL (HID_CUI_START + 14) -#define HID_OPTIONS_ASIAN_LAYOUT (HID_CUI_START + 15) -#define HID_CLB_EDIT_MODULES_DICS (HID_CUI_START + 16) -#define HID_CLB_EDIT_MODULES_MODULES (HID_CUI_START + 17) -#define HID_CLB_LINGU_MODULES (HID_CUI_START + 18) -#define HID_CLB_LINGU_OPTIONS (HID_CUI_START + 19) -#define HID_EDIT_MODULES (HID_CUI_START + 20) -#define HID_LNGDLG_NUM_PREBREAK (HID_CUI_START + 21) -#define HID_OPTIONS_COLORCONFIG (HID_CUI_START + 22) -#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME (HID_CUI_START + 23) -#define HID_OPTIONS_ACCESSIBILITYCONFIG (HID_CUI_START + 24) -#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN (HID_CUI_START + 25) -#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME (HID_CUI_START + 26) -#define HID_OPTIONS_PATHS_SELECTFOLDER (HID_CUI_START + 27) -#define HID_OPTIONS_JAVA (HID_CUI_START + 28) -#define HID_OPTIONS_JAVA_LIST (HID_CUI_START + 29) -#define HID_OPTIONS_JAVA_PARAMETER (HID_CUI_START + 30) -#define HID_OPTIONS_JAVA_CLASSPATH (HID_CUI_START + 31) -#define HID_SVXPAGE_JSEARCH_OPTIONS (HID_CUI_START + 32) -#define HID_SVXDLG_FILTER_WARNING (HID_CUI_START + 33) -#define HID_SVX_OPTIONS_ONLINEUPDATE (HID_CUI_START + 34) -#define HID_DLG_SECURITY_OPTIONS (HID_CUI_START + 35) -#define HID_OFADLG_OPTIONS_TREE (HID_CUI_START + 36) -#define HID_OFA_CONNPOOL_DRIVERLIST (HID_CUI_START + 37) -#define UID_OFA_CONNPOOL_DRIVERLIST_BACK (HID_CUI_START + 38) -#define HID_OFA_FONT_SUBST_CLB (HID_CUI_START + 39) -#define HID_OFA_TP_MISC (HID_CUI_START + 40) -#define HID_OFA_TP_VIEW (HID_CUI_START + 41) -#define HID_OFA_TP_LANGUAGES (HID_CUI_START + 42) -#define HID_OFA_TP_MEMORY (HID_CUI_START + 43) -#define HID_DBPATH_CTL_PATH (HID_CUI_START + 44) -#define HID_DBPATH_HEADERBAR (HID_CUI_START + 45) -#define HID_OFAPAGE_SMARTTAG_OPTIONS (HID_CUI_START + 46) -#define HID_OFAPAGE_MSFLTR2_CLB (HID_CUI_START + 47) -#define HID_OPTPATH_CTL_PATH (HID_CUI_START + 48) -#define HID_OFADLG_TREELISTBOX (HID_CUI_START + 49) -#define HID_DLG_WEBCONNECTION_INFO (HID_CUI_START + 50) -#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST (HID_CUI_START + 51) -#define HID_OPTPATH_HEADERBAR (HID_CUI_START + 52) -#define HID_WARN_NAME_DUPLICATE (HID_CUI_START + 53) -#define HID_COLORPAGE_LISTBOX_START (HID_CUI_START + 54) -#define HID_COLORPAGE_DOCCOLOR_LB (HID_CUI_START + 54) -#define HID_COLORPAGE_DOCBOUNDARIES_LB (HID_CUI_START + 55) -#define HID_COLORPAGE_APPBACKGROUND_LB (HID_CUI_START + 56) -#define HID_COLORPAGE_OBJECTBOUNDARIES_LB (HID_CUI_START + 57) -#define HID_COLORPAGE_TABLEBOUNDARIES_LB (HID_CUI_START + 58) -#define HID_COLORPAGE_FONTCOLOR_LB (HID_CUI_START + 59) -#define HID_COLORPAGE_LINKS_LB (HID_CUI_START + 60) -#define HID_COLORPAGE_LINKSVISITED_LB (HID_CUI_START + 61) -#define HID_COLORPAGE_ANCHOR_LB (HID_CUI_START + 62) -#define HID_COLORPAGE_SPELL_LB (HID_CUI_START + 63) -#define HID_COLORPAGE_WRITERTEXTGRID_LB (HID_CUI_START + 64) -#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB (HID_CUI_START + 65) -#define HID_COLORPAGE_WRITERIDXSHADINGS_LB (HID_CUI_START + 66) -#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB (HID_CUI_START + 67) -#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB (HID_CUI_START + 68) -#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB (HID_CUI_START + 69) -#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB (HID_CUI_START + 70) -#define HID_COLORPAGE_WRITERPAGEBREAKS_LB (HID_CUI_START + 71) -#define HID_COLORPAGE_HTMLSGML_LB (HID_CUI_START + 72) -#define HID_COLORPAGE_HTMLCOMMENT_LB (HID_CUI_START + 73) -#define HID_COLORPAGE_HTMLKEYWORD_LB (HID_CUI_START + 74) -#define HID_COLORPAGE_HTMLUNKNOWN_LB (HID_CUI_START + 75) -#define HID_COLORPAGE_CALCGRID_LB (HID_CUI_START + 76) -#define HID_COLORPAGE_CALCPAGEBREAK_LB (HID_CUI_START + 77) -#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB (HID_CUI_START + 78) -#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB (HID_CUI_START + 79) -#define HID_COLORPAGE_CALCDETECTIVE_LB (HID_CUI_START + 80) -#define HID_COLORPAGE_CALCDETECTIVEERROR_LB (HID_CUI_START + 81) -#define HID_COLORPAGE_CALCREFERENCE_LB (HID_CUI_START + 82) -#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB (HID_CUI_START + 83) -#define HID_COLORPAGE_DRAWGRID_LB (HID_CUI_START + 84) -#define HID_COLORPAGE_DRAWDRAWING_LB (HID_CUI_START + 85) -#define HID_COLORPAGE_DRAWFILL_LB (HID_CUI_START + 86) -#define HID_COLORPAGE_BASICIDENTIFIER_LB (HID_CUI_START + 87) -#define HID_COLORPAGE_BASICCOMMENT_LB (HID_CUI_START + 88) -#define HID_COLORPAGE_BASICNUMBER_LB (HID_CUI_START + 89) -#define HID_COLORPAGE_BASICSTRING_LB (HID_CUI_START + 90) -#define HID_COLORPAGE_BASICOPERATOR_LB (HID_CUI_START + 91) -#define HID_COLORPAGE_BASICKEYWORD_LB (HID_CUI_START + 92) -#define HID_COLORPAGE_BASICERROR_LB (HID_CUI_START + 93) -#define HID_COLORPAGE_CHECKBOX_START (HID_CUI_START + 94) -#define HID_COLORPAGE_DOCCOLOR_CB (HID_CUI_START + 94) -#define HID_COLORPAGE_DOCBOUNDARIES_CB (HID_CUI_START + 95) -#define HID_COLORPAGE_APPBACKGROUND_CB (HID_CUI_START + 96) -#define HID_COLORPAGE_OBJECTBOUNDARIES_CB (HID_CUI_START + 97) -#define HID_COLORPAGE_TABLEBOUNDARIES_CB (HID_CUI_START + 98) -#define HID_COLORPAGE_FONTCOLOR_CB (HID_CUI_START + 99) -#define HID_COLORPAGE_LINKS_CB (HID_CUI_START + 100) -#define HID_COLORPAGE_LINKSVISITED_CB (HID_CUI_START + 101) -#define HID_COLORPAGE_ANCHOR_CB (HID_CUI_START + 102) -#define HID_COLORPAGE_SPELL_CB (HID_CUI_START + 103) -#define HID_COLORPAGE_WRITERTEXTGRID_CB (HID_CUI_START + 104) -#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB (HID_CUI_START + 105) -#define HID_COLORPAGE_WRITERIDXSHADINGS_CB (HID_CUI_START + 106) -#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB (HID_CUI_START + 107) -#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB (HID_CUI_START + 108) -#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB (HID_CUI_START + 109) -#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB (HID_CUI_START + 110) -#define HID_COLORPAGE_WRITERPAGEBREAKS_CB (HID_CUI_START + 111) -#define HID_COLORPAGE_HTMLSGML_CB (HID_CUI_START + 112) -#define HID_COLORPAGE_HTMLCOMMENT_CB (HID_CUI_START + 113) -#define HID_COLORPAGE_HTMLKEYWORD_CB (HID_CUI_START + 114) -#define HID_COLORPAGE_HTMLUNKNOWN_CB (HID_CUI_START + 115) -#define HID_COLORPAGE_CALCGRID_CB (HID_CUI_START + 116) -#define HID_COLORPAGE_CALCPAGEBREAK_CB (HID_CUI_START + 117) -#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB (HID_CUI_START + 118) -#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB (HID_CUI_START + 119) -#define HID_COLORPAGE_CALCDETECTIVE_CB (HID_CUI_START + 120) -#define HID_COLORPAGE_CALCDETECTIVEERROR_CB (HID_CUI_START + 121) -#define HID_COLORPAGE_CALCREFERENCE_CB (HID_CUI_START + 122) -#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB (HID_CUI_START + 123) -#define HID_COLORPAGE_DRAWGRID_CB (HID_CUI_START + 124) -#define HID_COLORPAGE_DRAWDRAWING_CB (HID_CUI_START + 125) -#define HID_COLORPAGE_DRAWFILL_CB (HID_CUI_START + 126) -#define HID_COLORPAGE_BASICIDENTIFIER_CB (HID_CUI_START + 127) -#define HID_COLORPAGE_BASICCOMMENT_CB (HID_CUI_START + 128) -#define HID_COLORPAGE_BASICNUMBER_CB (HID_CUI_START + 129) -#define HID_COLORPAGE_BASICSTRING_CB (HID_CUI_START + 130) -#define HID_COLORPAGE_BASICOPERATOR_CB (HID_CUI_START + 131) -#define HID_COLORPAGE_BASICKEYWORD_CB (HID_CUI_START + 132) -#define HID_COLORPAGE_BASICERROR_CB (HID_CUI_START + 133) -#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE (HID_CUI_START + 134) -#define HID_SVX_MACRO_LB_EVENT (HID_CUI_START + 135) -#define HID_SVX_CONFIG_EVENT (HID_CUI_START + 136) -#define HID_CONFIG_EVENT_OFFICE_BASED (HID_CUI_START + 137) -#define HID_CONFIG_EVENT_DOCUMENT_BASED (HID_CUI_START + 138) -#define HID_SELECTOR_DIALOG (HID_CUI_START + 139) -#define HID_SELECTOR_CATEGORIES (HID_CUI_START + 140) -#define HID_SVX_CONFIG_TOOLBAR (HID_CUI_START + 141) -#define HID_SVX_CONFIG_TOOLBAR_CONTENTS (HID_CUI_START + 142) -#define HID_SELECTOR_COMMANDS (HID_CUI_START + 143) -#define HID_GALLERY_EDIT_MSNAME (HID_CUI_START + 144) -#define HID_SVX_CONFIG_MENU (HID_CUI_START + 145) -#define HID_SVX_CONFIG_MENU_CONTENTS (HID_CUI_START + 146) -#define HID_GALLERY_NEWTHEME_FINDFILES (HID_CUI_START + 147) -#define HID_GALLERY_NEWTHEME_ADDFILES (HID_CUI_START + 148) -#define HID_HANGULDLG_BUTTON_OPTIONS (HID_CUI_START + 149) -#define HID_HANGULDLG_BUTTON_CLOSE (HID_CUI_START + 150) -#define HID_HANGULDLG_BUTTON_IGNORE (HID_CUI_START + 151) -#define HID_HANGULDLG_BUTTON_IGNOREALL (HID_CUI_START + 152) -#define HID_HANGULDLG_BUTTON_CHANGE (HID_CUI_START + 153) -#define HID_HANGULDLG_BUTTON_CHANGEALL (HID_CUI_START + 154) -#define HID_OFA_FONT_SUBSTITUTION (HID_CUI_START + 155) -#define HID_HANGULDLG_EDIT_NEWWORD (HID_CUI_START + 156) -#define HID_OFA_SUBST_APPLY (HID_CUI_START + 157) -#define HID_OFA_SUBST_DELETE (HID_CUI_START + 158) -#define HID_SPLDLG_BUTTON_CLOSE (HID_CUI_START + 159) -#define HID_SPLDLG_BUTTON_IGNORE (HID_CUI_START + 160) -#define HID_SPLDLG_BUTTON_IGNOREALL (HID_CUI_START + 161) -#define HID_SPLDLG_BUTTON_CHANGE (HID_CUI_START + 162) -#define HID_SPLDLG_BUTTON_CHANGEALL (HID_CUI_START + 163) -#define HID_SPLDLG_BUTTON_EXPLAIN (HID_CUI_START + 164) -#define HID_CHARMAP_CTL_SHOWSET (HID_CUI_START + 165) -#define HID_CHARMAP_CTL_SHOWTEXT (HID_CUI_START + 166) -#define HID_CHARMAP_CTL_SHOWCHAR (HID_CUI_START + 167) -#define HID_DLG_NAME (HID_CUI_START + 168) -#define HID_DLG_MESSBOX (HID_CUI_START + 169) -#define HID_HANGULDLG_SUGGESTIONS (HID_CUI_START + 170) -#define HID_HANGULDLG_SUGGESTIONS_GRID (HID_CUI_START + 171) -#define HID_HANGULDLG_SUGGESTIONS_LIST (HID_CUI_START + 172) -#define HID_DLG_OBJECT_NAME (HID_CUI_START + 173) -#define HID_DLG_OBJECT_TITLE_DESC (HID_CUI_START + 174) -#define HID_SVX_CONFIG_MENU_ORGANIZER (HID_CUI_START + 175) -#define HID_SVX_CONFIG_ICON_SELECTOR (HID_CUI_START + 176) -#define HID_SVX_CONFIG_NAME_SUBMENU (HID_CUI_START + 177) -#define HID_SVX_CONFIG_RENAME_MENU (HID_CUI_START + 178) -#define HID_SVX_CONFIG_RENAME_MENU_ITEM (HID_CUI_START + 179) -#define HID_SVX_CONFIG_RENAME_TOOLBAR (HID_CUI_START + 180) -#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM (HID_CUI_START + 181) -#define HID_SVX_NEW_TOOLBAR (HID_CUI_START + 182) -#define HID_SVX_MODIFY_TOOLBAR (HID_CUI_START + 183) -#define HID_SVX_NEW_TOOLBAR_ITEM (HID_CUI_START + 184) -#define HID_SVX_CONFIG_MENU_LISTBOX (HID_CUI_START + 185) -#define HID_SVX_MODIFY_TOOLBAR_ITEM (HID_CUI_START + 186) -#define HID_SVX_SAVE_IN (HID_CUI_START + 187) -#define HID_OPTIONS_MULTIPATH_LIST (HID_CUI_START + 188) -#define HID_FM_DLG_SEARCH (HID_CUI_START + 189) -#define HID_SEARCH_TEXT (HID_CUI_START + 190) -#define HID_SEARCH_ALLFIELDS (HID_CUI_START + 191) -#define HID_GALLERY_PROPERTIES_GENERAL (HID_CUI_START + 192) -#define HID_SEARCH_FIELDSELECTION (HID_CUI_START + 193) -#define HID_SEARCH_POSITION (HID_CUI_START + 194) -#define HID_SEARCH_FORMATTER (HID_CUI_START + 195) -#define HID_SEARCH_CASE (HID_CUI_START + 196) -#define HID_SEARCH_BACKWARD (HID_CUI_START + 197) -#define HID_SEARCH_STARTOVER (HID_CUI_START + 198) -#define HID_SEARCH_WILDCARD (HID_CUI_START + 199) -#define HID_SEARCH_REGULAR (HID_CUI_START + 200) -#define HID_SEARCH_APPROX (HID_CUI_START + 201) -#define HID_SEARCH_APPROXSETTINGS (HID_CUI_START + 202) -#define HID_SEARCH_BTN_SEARCH (HID_CUI_START + 203) -#define HID_SEARCH_BTN_CLOSE (HID_CUI_START + 204) -#define HID_GALLERY_BROWSER (HID_CUI_START + 205) -#define HID_GALLERY_SEARCH (HID_CUI_START + 206) -#define HID_GALLERY_APPLY (HID_CUI_START + 207) -#define HID_SPLDLG_BUTTON_IGNORERULE (HID_CUI_START + 208) -#define HID_CONFIG_ACCEL (HID_CUI_START + 209) -#define HID_ACCELCONFIG_LISTBOX (HID_CUI_START + 210) -#define HID_CONFIGGROUP_ACC_LISTBOX (HID_CUI_START + 211) -#define HID_CONFIGFUNCTION_ACC_LISTBOX (HID_CUI_START + 212) -#define HID_MACRO_LB_EVENT (HID_CUI_START + 213) -#define HID_MACRO_GROUP (HID_CUI_START + 214) -#define HID_MACRO_MACROS (HID_CUI_START + 215) -#define HID_DIALOG_HANGULHANJA (HID_CUI_START + 216) -#define HID_HANGULHANJA_OPT_DLG (HID_CUI_START + 217) -#define HID_HANGULHANJA_NEWDICT_DLG (HID_CUI_START + 218) -#define HID_HANGULHANJA_EDIT_DLG (HID_CUI_START + 219) -#define HID_HANGULHANJA_OPT_DICTS_LB (HID_CUI_START + 220) -#define HID_MULTIPATH (HID_CUI_START + 221) -#define HID_SCRIPTORG_DIALOG (HID_CUI_START + 222) -#define HID_SCRIPTSBOX (HID_CUI_START + 223) -#define HID_SPELLCHECK (HID_CUI_START + 224) -#define HID_TPSIZE_CTRL (HID_CUI_START + 225) -#define HID_TPROTATION_CTRL1 (HID_CUI_START + 226) -#define HID_TPROTATION_CTRL2 (HID_CUI_START + 227) -#define HID_TRANS_ANGLE (HID_CUI_START + 228) -#define HID_TPPOSITION_CTRL (HID_CUI_START + 229) -#define HID_NUMBERFORMAT_LB_FORMAT (HID_CUI_START + 230) -#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW (HID_CUI_START + 231) -#define HID_TRANS_SLANT (HID_CUI_START + 232) -#define HID_TPHATCH_CTRL (HID_CUI_START + 233) -#define HID_SEARCHATTR_CTL_ATTR (HID_CUI_START + 234) -#define HID_NUMBERFORMAT_TBI_INFO (HID_CUI_START + 235) -#define HID_SEARCHATTR (HID_CUI_START + 236) -#define HID_ALIGNMENT_CTR_DIAL (HID_CUI_START + 237) -#define HID_ALIGNMENT_CTR_BORDER_LOCK (HID_CUI_START + 238) -#define HID_SEARCHSIMILARITY (HID_CUI_START + 239) -#define UID_SEARCH_RECORDSTATUS (HID_CUI_START + 240) -#define HID_OFAPAGE_AUTOCORR_CLB (HID_CUI_START + 241) -#define HID_AUTOCORR_LANGUAGE (HID_CUI_START + 242) -#define HID_OFAPAGE_AUTOFORMAT_CLB (HID_CUI_START + 243) -#define HID_TPCOLOR_RGB_1 (HID_CUI_START + 244) -#define HID_TPCOLOR_RGB_2 (HID_CUI_START + 245) -#define HID_TPCOLOR_RGB_3 (HID_CUI_START + 246) -#define HID_TPCOLOR_CMYK_1 (HID_CUI_START + 247) -#define HID_TPCOLOR_CMYK_2 (HID_CUI_START + 248) -#define HID_TPCOLOR_CMYK_3 (HID_CUI_START + 249) -#define HID_ALIGNMENT (HID_CUI_START + 250) -#define HID_OFAPAGE_AUTOCORR_OPTIONS (HID_CUI_START + 251) -#define HID_OFAPAGE_AUTOFMT_OPTIONS (HID_CUI_START + 252) -#define HID_OFAPAGE_AUTOCORR_REPLACE (HID_CUI_START + 253) -#define HID_OFACTL_AUTOCORR_REPLACE (HID_CUI_START + 254) -#define HID_OFAPAGE_AUTOCORR_EXCEPT (HID_CUI_START + 255) -#define HID_OFAPAGE_AUTOCORR_QUOTE (HID_CUI_START + 256) -#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS (HID_CUI_START + 257) -#define HID_BACKGROUND (HID_CUI_START + 258) -#define HID_BACKGROUND_CTL_BGDCOLORSET (HID_CUI_START + 259) -#define HID_BACKGROUND_CTL_POSITION (HID_CUI_START + 260) -#define HID_BORDER (HID_CUI_START + 261) -#define HID_BORDER_CTL_PRESETS (HID_CUI_START + 262) -#define HID_BORDER_CTL_SHADOWS (HID_CUI_START + 263) -#define HID_PAGE_CONNECTION (HID_CUI_START + 264) -#define HID_PAGE_CONNECTION_CTL_PREVIEW (HID_CUI_START + 265) -#define HID_PAGE_DISTRIBUTE (HID_CUI_START + 266) -#define HID_SVXPAGE_GRFCROP (HID_CUI_START + 267) -#define HID_CAPTION (HID_CUI_START + 268) -#define HID_CAPTION_CTL_TYPE (HID_CUI_START + 269) -#define HID_PAGE_MEASURE (HID_CUI_START + 270) -#define HID_MEASURE_CTL_POSITION (HID_CUI_START + 271) -#define HID_NUMBERFORMAT (HID_CUI_START + 272) -#define HID_NUMBERFORMAT_TBI_ADD (HID_CUI_START + 273) -#define HID_NUMBERFORMAT_TBI_REMOVE (HID_CUI_START + 274) -#define HID_FORMAT_PAGE (HID_CUI_START + 275) -#define HID_REDLINING_DLG (HID_CUI_START + 276) -#define HID_REDLINING_EDIT (HID_CUI_START + 277) -#define HID_REDLINING_PREV (HID_CUI_START + 278) -#define HID_REDLINING_NEXT (HID_CUI_START + 279) -#define HID_FORMAT_PARAGRAPH_STD (HID_CUI_START + 280) -#define HID_VALUESET_SINGLENUM (HID_CUI_START + 281) -#define HID_VALUESET_BULLET (HID_CUI_START + 282) -#define HID_VALUESET_NUM (HID_CUI_START + 283) -#define HID_VALUESET_NUMBMP (HID_CUI_START + 284) -#define HID_SVXPAGE_PICK_NUM (HID_CUI_START + 285) -#define HID_SVXPAGE_PICK_SINGLE_NUM (HID_CUI_START + 286) -#define HID_SVXPAGE_PICK_BMP (HID_CUI_START + 287) -#define HID_SVXPAGE_PICK_BULLET (HID_CUI_START + 288) -#define HID_SVXPAGE_NUM_OPTIONS (HID_CUI_START + 289) -#define HID_SVXPAGE_NUM_POSITION (HID_CUI_START + 290) -#define HID_MEASURE_CTL_PREVIEW (HID_CUI_START + 291) -#define HID_FORMAT_PARAGRAPH_EXT (HID_CUI_START + 292) -#define HID_FORMAT_PARAGRAPH_ALIGN (HID_CUI_START + 293) -#define HID_SVXPAGE_PARA_ASIAN (HID_CUI_START + 294) -#define HID_SVXPAGE_SWPOSSIZE (HID_CUI_START + 295) -#define HID_AREA_TRANSPARENCE (HID_CUI_START + 296) -#define HID_AREA_AREA (HID_CUI_START + 297) -#define HID_AREA_SHADOW (HID_CUI_START + 298) -#define HID_AREA_HATCH (HID_CUI_START + 299) -#define HID_AREA_BITMAP (HID_CUI_START + 300) -#define HID_TPSHADOW_CTRL (HID_CUI_START + 301) -#define HID_AREA_GRADIENT (HID_CUI_START + 302) -#define HID_LINE_ENDDEF (HID_CUI_START + 303) -#define HID_LINE_LINE (HID_CUI_START + 304) -#define HID_LINE_DEF (HID_CUI_START + 305) -#define HID_SPELLDLG_SETWORD (HID_CUI_START + 306) -#define HID_TABULATOR (HID_CUI_START + 307) -#define HID_PAGE_TEXTATTR (HID_CUI_START + 308) -#define HID_TEXTATTR_CTL_POSITION (HID_CUI_START + 309) -#define HID_TRANS_POSITION_SIZE (HID_CUI_START + 310) -#define HID_HYPHENATE (HID_CUI_START + 311) -#define HID_SVXPAGE_CHAR_NAME (HID_CUI_START + 312) -#define HID_SVXPAGE_CHAR_EFFECTS (HID_CUI_START + 313) -#define HID_SVXPAGE_CHAR_POSITION (HID_CUI_START + 314) -#define HID_HYPERLINK_INTERNET (HID_CUI_START + 315) -#define HID_HYPERLINK_MAIL (HID_CUI_START + 316) -#define HID_HYPERLINK_DOCUMENT (HID_CUI_START + 317) -#define HID_HYPERLINK_NEWDOCUMENT (HID_CUI_START + 318) -#define HID_HYPERLINK_MARKWND (HID_CUI_START + 319) -#define HID_ICCDIALOG_RESET_BTN (HID_CUI_START + 320) -#define HID_ICCDIALOG_CHOICECTRL (HID_CUI_START + 321) -#define HID_HYPERDLG_INET_PATH (HID_CUI_START + 322) -#define HID_HYPERDLG_MAIL_PATH (HID_CUI_START + 323) -#define HID_HYPERDLG_DOC_PATH (HID_CUI_START + 324) -#define HID_ICCDIALOG_OK_BTN (HID_CUI_START + 325) -#define HID_ICCDIALOG_CANCEL_BTN (HID_CUI_START + 326) -#define HID_HYPERLINK_MARKWND_APPLY (HID_CUI_START + 327) -#define HID_HYPERLINK_MARKWND_CLOSE (HID_CUI_START + 328) -#define HID_HYPERLINK_MARKWND_TREE (HID_CUI_START + 329) -#define HID_SVXPAGE_CHAR_TWOLINES (HID_CUI_START + 330) -#define HID_GRFFILTER_EMBOSS_LIGHT (HID_CUI_START + 331) -#define HID_PASTE_DLG (HID_CUI_START + 333) -#define HID_LINKDLG_TABLB (HID_CUI_START + 334) -#define HID_MACRO_HEADERTABLISTBOX (HID_CUI_START + 335) -#define HID_GALLERY_ENTER_TITLE (HID_CUI_START + 336) -#define HID_GALLERY_TITLE_EDIT (HID_CUI_START + 337) -#define HID_THES_LANGUAGE (HID_CUI_START + 338) -#define HID_OFAPAGE_QUOTE_SW_CLB (HID_CUI_START + 339) -#define HID_OFAPAGE_QUOTE_CLB (HID_CUI_START + 340) -#define HID_CT_THES_ALTERNATIVES (HID_CUI_START + 341) +#define HID_OPTIONS_COLOR "CUI_HID_OPTIONS_COLOR" +#define HID_OPTIONS_SAVE "CUI_HID_OPTIONS_SAVE" +#define HID_OPTIONS_PATH "CUI_HID_OPTIONS_PATH" +#define HID_OPTIONS_GENERAL "CUI_HID_OPTIONS_GENERAL" +#define HID_OPTIONS_LINGU "CUI_HID_OPTIONS_LINGU" +#define HID_OPTIONS_SPELL "CUI_HID_OPTIONS_SPELL" +#define HID_OPTIONS_DICT_NEW "CUI_HID_OPTIONS_DICT_NEW" +#define HID_OPTIONS_DICT_EDIT "CUI_HID_OPTIONS_DICT_EDIT" +#define HID_OPTIONS_INET "CUI_HID_OPTIONS_INET" +#define HID_OPTIONS_CHART_DEFCOLORS "CUI_HID_OPTIONS_CHART_DEFCOLORS" +#define HID_OPTIONS_CTL "CUI_HID_OPTIONS_CTL" +#define HID_OPTIONS_PROXY "CUI_HID_OPTIONS_PROXY" +#define HID_OPTIONS_SEARCH "CUI_HID_OPTIONS_SEARCH" +#define HID_OPTIONS_MAIL "CUI_HID_OPTIONS_MAIL" +#define HID_OPTIONS_ASIAN_LAYOUT "CUI_HID_OPTIONS_ASIAN_LAYOUT" +#define HID_CLB_EDIT_MODULES_DICS "CUI_HID_CLB_EDIT_MODULES_DICS" +#define HID_CLB_EDIT_MODULES_MODULES "CUI_HID_CLB_EDIT_MODULES_MODULES" +#define HID_CLB_LINGU_MODULES "CUI_HID_CLB_LINGU_MODULES" +#define HID_CLB_LINGU_OPTIONS "CUI_HID_CLB_LINGU_OPTIONS" +#define HID_EDIT_MODULES "CUI_HID_EDIT_MODULES" +#define HID_LNGDLG_NUM_PREBREAK "CUI_HID_LNGDLG_NUM_PREBREAK" +#define HID_OPTIONS_COLORCONFIG "CUI_HID_OPTIONS_COLORCONFIG" +#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME" +#define HID_OPTIONS_ACCESSIBILITYCONFIG "CUI_HID_OPTIONS_ACCESSIBILITYCONFIG" +#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN "CUI_HID_OPTIONS_COLORCONFIG_COLORLIST_WIN" +#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_NAME_SCHEME" +#define HID_OPTIONS_PATHS_SELECTFOLDER "CUI_HID_OPTIONS_PATHS_SELECTFOLDER" +#define HID_OPTIONS_JAVA "CUI_HID_OPTIONS_JAVA" +#define HID_OPTIONS_JAVA_LIST "CUI_HID_OPTIONS_JAVA_LIST" +#define HID_OPTIONS_JAVA_PARAMETER "CUI_HID_OPTIONS_JAVA_PARAMETER" +#define HID_OPTIONS_JAVA_CLASSPATH "CUI_HID_OPTIONS_JAVA_CLASSPATH" +#define HID_SVXPAGE_JSEARCH_OPTIONS "CUI_HID_SVXPAGE_JSEARCH_OPTIONS" +#define HID_SVXDLG_FILTER_WARNING "CUI_HID_SVXDLG_FILTER_WARNING" +#define HID_SVX_OPTIONS_ONLINEUPDATE "CUI_HID_SVX_OPTIONS_ONLINEUPDATE" +#define HID_DLG_SECURITY_OPTIONS "CUI_HID_DLG_SECURITY_OPTIONS" +#define HID_OFADLG_OPTIONS_TREE "CUI_HID_OFADLG_OPTIONS_TREE" +#define HID_OFA_CONNPOOL_DRIVERLIST "CUI_HID_OFA_CONNPOOL_DRIVERLIST" +#define UID_OFA_CONNPOOL_DRIVERLIST_BACK "CUI_UID_OFA_CONNPOOL_DRIVERLIST_BACK" +#define HID_OFA_FONT_SUBST_CLB "CUI_HID_OFA_FONT_SUBST_CLB" +#define HID_OFA_TP_MISC "CUI_HID_OFA_TP_MISC" +#define HID_OFA_TP_VIEW "CUI_HID_OFA_TP_VIEW" +#define HID_OFA_TP_LANGUAGES "CUI_HID_OFA_TP_LANGUAGES" +#define HID_OFA_TP_MEMORY "CUI_HID_OFA_TP_MEMORY" +#define HID_DBPATH_CTL_PATH "CUI_HID_DBPATH_CTL_PATH" +#define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR" +#define HID_OFAPAGE_SMARTTAG_OPTIONS "CUI_HID_OFAPAGE_SMARTTAG_OPTIONS" +#define HID_OFAPAGE_MSFLTR2_CLB "CUI_HID_OFAPAGE_MSFLTR2_CLB" +#define HID_OPTPATH_CTL_PATH "CUI_HID_OPTPATH_CTL_PATH" +#define HID_OFADLG_TREELISTBOX "CUI_HID_OFADLG_TREELISTBOX" +#define HID_DLG_WEBCONNECTION_INFO "CUI_HID_DLG_WEBCONNECTION_INFO" +#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST "CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST" +#define HID_OPTPATH_HEADERBAR "CUI_HID_OPTPATH_HEADERBAR" +#define HID_WARN_NAME_DUPLICATE "CUI_HID_WARN_NAME_DUPLICATE" +#define HID_COLORPAGE_LISTBOX_START "CUI_HID_COLORPAGE_LISTBOX_START" +#define HID_COLORPAGE_DOCCOLOR_LB "CUI_HID_COLORPAGE_DOCCOLOR_LB" +#define HID_COLORPAGE_DOCBOUNDARIES_LB "CUI_HID_COLORPAGE_DOCBOUNDARIES_LB" +#define HID_COLORPAGE_APPBACKGROUND_LB "CUI_HID_COLORPAGE_APPBACKGROUND_LB" +#define HID_COLORPAGE_OBJECTBOUNDARIES_LB "CUI_HID_COLORPAGE_OBJECTBOUNDARIES_LB" +#define HID_COLORPAGE_TABLEBOUNDARIES_LB "CUI_HID_COLORPAGE_TABLEBOUNDARIES_LB" +#define HID_COLORPAGE_FONTCOLOR_LB "CUI_HID_COLORPAGE_FONTCOLOR_LB" +#define HID_COLORPAGE_LINKS_LB "CUI_HID_COLORPAGE_LINKS_LB" +#define HID_COLORPAGE_LINKSVISITED_LB "CUI_HID_COLORPAGE_LINKSVISITED_LB" +#define HID_COLORPAGE_ANCHOR_LB "CUI_HID_COLORPAGE_ANCHOR_LB" +#define HID_COLORPAGE_SPELL_LB "CUI_HID_COLORPAGE_SPELL_LB" +#define HID_COLORPAGE_WRITERTEXTGRID_LB "CUI_HID_COLORPAGE_WRITERTEXTGRID_LB" +#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB "CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_LB" +#define HID_COLORPAGE_WRITERIDXSHADINGS_LB "CUI_HID_COLORPAGE_WRITERIDXSHADINGS_LB" +#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB "CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_LB" +#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_LB" +#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB" +#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB" +#define HID_COLORPAGE_WRITERPAGEBREAKS_LB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_LB" +#define HID_COLORPAGE_HTMLSGML_LB "CUI_HID_COLORPAGE_HTMLSGML_LB" +#define HID_COLORPAGE_HTMLCOMMENT_LB "CUI_HID_COLORPAGE_HTMLCOMMENT_LB" +#define HID_COLORPAGE_HTMLKEYWORD_LB "CUI_HID_COLORPAGE_HTMLKEYWORD_LB" +#define HID_COLORPAGE_HTMLUNKNOWN_LB "CUI_HID_COLORPAGE_HTMLUNKNOWN_LB" +#define HID_COLORPAGE_CALCGRID_LB "CUI_HID_COLORPAGE_CALCGRID_LB" +#define HID_COLORPAGE_CALCPAGEBREAK_LB "CUI_HID_COLORPAGE_CALCPAGEBREAK_LB" +#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB "CUI_HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB" +#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB "CUI_HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB" +#define HID_COLORPAGE_CALCDETECTIVE_LB "CUI_HID_COLORPAGE_CALCDETECTIVE_LB" +#define HID_COLORPAGE_CALCDETECTIVEERROR_LB "CUI_HID_COLORPAGE_CALCDETECTIVEERROR_LB" +#define HID_COLORPAGE_CALCREFERENCE_LB "CUI_HID_COLORPAGE_CALCREFERENCE_LB" +#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB "CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_LB" +#define HID_COLORPAGE_DRAWGRID_LB "CUI_HID_COLORPAGE_DRAWGRID_LB" +#define HID_COLORPAGE_DRAWDRAWING_LB "CUI_HID_COLORPAGE_DRAWDRAWING_LB" +#define HID_COLORPAGE_DRAWFILL_LB "CUI_HID_COLORPAGE_DRAWFILL_LB" +#define HID_COLORPAGE_BASICIDENTIFIER_LB "CUI_HID_COLORPAGE_BASICIDENTIFIER_LB" +#define HID_COLORPAGE_BASICCOMMENT_LB "CUI_HID_COLORPAGE_BASICCOMMENT_LB" +#define HID_COLORPAGE_BASICNUMBER_LB "CUI_HID_COLORPAGE_BASICNUMBER_LB" +#define HID_COLORPAGE_BASICSTRING_LB "CUI_HID_COLORPAGE_BASICSTRING_LB" +#define HID_COLORPAGE_BASICOPERATOR_LB "CUI_HID_COLORPAGE_BASICOPERATOR_LB" +#define HID_COLORPAGE_BASICKEYWORD_LB "CUI_HID_COLORPAGE_BASICKEYWORD_LB" +#define HID_COLORPAGE_BASICERROR_LB "CUI_HID_COLORPAGE_BASICERROR_LB" +#define HID_COLORPAGE_CHECKBOX_START "CUI_HID_COLORPAGE_CHECKBOX_START" +#define HID_COLORPAGE_DOCCOLOR_CB "CUI_HID_COLORPAGE_DOCCOLOR_CB" +#define HID_COLORPAGE_DOCBOUNDARIES_CB "CUI_HID_COLORPAGE_DOCBOUNDARIES_CB" +#define HID_COLORPAGE_APPBACKGROUND_CB "CUI_HID_COLORPAGE_APPBACKGROUND_CB" +#define HID_COLORPAGE_OBJECTBOUNDARIES_CB "CUI_HID_COLORPAGE_OBJECTBOUNDARIES_CB" +#define HID_COLORPAGE_TABLEBOUNDARIES_CB "CUI_HID_COLORPAGE_TABLEBOUNDARIES_CB" +#define HID_COLORPAGE_FONTCOLOR_CB "CUI_HID_COLORPAGE_FONTCOLOR_CB" +#define HID_COLORPAGE_LINKS_CB "CUI_HID_COLORPAGE_LINKS_CB" +#define HID_COLORPAGE_LINKSVISITED_CB "CUI_HID_COLORPAGE_LINKSVISITED_CB" +#define HID_COLORPAGE_ANCHOR_CB "CUI_HID_COLORPAGE_ANCHOR_CB" +#define HID_COLORPAGE_SPELL_CB "CUI_HID_COLORPAGE_SPELL_CB" +#define HID_COLORPAGE_WRITERTEXTGRID_CB "CUI_HID_COLORPAGE_WRITERTEXTGRID_CB" +#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB "CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_CB" +#define HID_COLORPAGE_WRITERIDXSHADINGS_CB "CUI_HID_COLORPAGE_WRITERIDXSHADINGS_CB" +#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB "CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_CB" +#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_CB" +#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB" +#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB" +#define HID_COLORPAGE_WRITERPAGEBREAKS_CB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_CB" +#define HID_COLORPAGE_HTMLSGML_CB "CUI_HID_COLORPAGE_HTMLSGML_CB" +#define HID_COLORPAGE_HTMLCOMMENT_CB "CUI_HID_COLORPAGE_HTMLCOMMENT_CB" +#define HID_COLORPAGE_HTMLKEYWORD_CB "CUI_HID_COLORPAGE_HTMLKEYWORD_CB" +#define HID_COLORPAGE_HTMLUNKNOWN_CB "CUI_HID_COLORPAGE_HTMLUNKNOWN_CB" +#define HID_COLORPAGE_CALCGRID_CB "CUI_HID_COLORPAGE_CALCGRID_CB" +#define HID_COLORPAGE_CALCPAGEBREAK_CB "CUI_HID_COLORPAGE_CALCPAGEBREAK_CB" +#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB "CUI_HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB" +#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB "CUI_HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB" +#define HID_COLORPAGE_CALCDETECTIVE_CB "CUI_HID_COLORPAGE_CALCDETECTIVE_CB" +#define HID_COLORPAGE_CALCDETECTIVEERROR_CB "CUI_HID_COLORPAGE_CALCDETECTIVEERROR_CB" +#define HID_COLORPAGE_CALCREFERENCE_CB "CUI_HID_COLORPAGE_CALCREFERENCE_CB" +#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB "CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_CB" +#define HID_COLORPAGE_DRAWGRID_CB "CUI_HID_COLORPAGE_DRAWGRID_CB" +#define HID_COLORPAGE_DRAWDRAWING_CB "CUI_HID_COLORPAGE_DRAWDRAWING_CB" +#define HID_COLORPAGE_DRAWFILL_CB "CUI_HID_COLORPAGE_DRAWFILL_CB" +#define HID_COLORPAGE_BASICIDENTIFIER_CB "CUI_HID_COLORPAGE_BASICIDENTIFIER_CB" +#define HID_COLORPAGE_BASICCOMMENT_CB "CUI_HID_COLORPAGE_BASICCOMMENT_CB" +#define HID_COLORPAGE_BASICNUMBER_CB "CUI_HID_COLORPAGE_BASICNUMBER_CB" +#define HID_COLORPAGE_BASICSTRING_CB "CUI_HID_COLORPAGE_BASICSTRING_CB" +#define HID_COLORPAGE_BASICOPERATOR_CB "CUI_HID_COLORPAGE_BASICOPERATOR_CB" +#define HID_COLORPAGE_BASICKEYWORD_CB "CUI_HID_COLORPAGE_BASICKEYWORD_CB" +#define HID_COLORPAGE_BASICERROR_CB "CUI_HID_COLORPAGE_BASICERROR_CB" +#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE "CUI_HID_NUMBERINGOPT_SEL_GRF_FROM_FILE" +#define HID_SVX_MACRO_LB_EVENT "CUI_HID_SVX_MACRO_LB_EVENT" +#define HID_SVX_CONFIG_EVENT "CUI_HID_SVX_CONFIG_EVENT" +#define HID_CONFIG_EVENT_OFFICE_BASED "CUI_HID_CONFIG_EVENT_OFFICE_BASED" +#define HID_CONFIG_EVENT_DOCUMENT_BASED "CUI_HID_CONFIG_EVENT_DOCUMENT_BASED" +#define HID_SELECTOR_DIALOG "CUI_HID_SELECTOR_DIALOG" +#define HID_SELECTOR_CATEGORIES "CUI_HID_SELECTOR_CATEGORIES" +#define HID_SVX_CONFIG_TOOLBAR "CUI_HID_SVX_CONFIG_TOOLBAR" +#define HID_SVX_CONFIG_TOOLBAR_CONTENTS "CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS" +#define HID_SELECTOR_COMMANDS "CUI_HID_SELECTOR_COMMANDS" +#define HID_GALLERY_EDIT_MSNAME "CUI_HID_GALLERY_EDIT_MSNAME" +#define HID_SVX_CONFIG_MENU "CUI_HID_SVX_CONFIG_MENU" +#define HID_SVX_CONFIG_MENU_CONTENTS "CUI_HID_SVX_CONFIG_MENU_CONTENTS" +#define HID_GALLERY_NEWTHEME_FINDFILES "CUI_HID_GALLERY_NEWTHEME_FINDFILES" +#define HID_GALLERY_NEWTHEME_ADDFILES "CUI_HID_GALLERY_NEWTHEME_ADDFILES" +#define HID_HANGULDLG_BUTTON_OPTIONS "CUI_HID_HANGULDLG_BUTTON_OPTIONS" +#define HID_HANGULDLG_BUTTON_CLOSE "CUI_HID_HANGULDLG_BUTTON_CLOSE" +#define HID_HANGULDLG_BUTTON_IGNORE "CUI_HID_HANGULDLG_BUTTON_IGNORE" +#define HID_HANGULDLG_BUTTON_IGNOREALL "CUI_HID_HANGULDLG_BUTTON_IGNOREALL" +#define HID_HANGULDLG_BUTTON_CHANGE "CUI_HID_HANGULDLG_BUTTON_CHANGE" +#define HID_HANGULDLG_BUTTON_CHANGEALL "CUI_HID_HANGULDLG_BUTTON_CHANGEALL" +#define HID_OFA_FONT_SUBSTITUTION "CUI_HID_OFA_FONT_SUBSTITUTION" +#define HID_HANGULDLG_EDIT_NEWWORD "CUI_HID_HANGULDLG_EDIT_NEWWORD" +#define HID_OFA_SUBST_APPLY "CUI_HID_OFA_SUBST_APPLY" +#define HID_OFA_SUBST_DELETE "CUI_HID_OFA_SUBST_DELETE" +#define HID_SPLDLG_BUTTON_CLOSE "CUI_HID_SPLDLG_BUTTON_CLOSE" +#define HID_SPLDLG_BUTTON_IGNORE "CUI_HID_SPLDLG_BUTTON_IGNORE" +#define HID_SPLDLG_BUTTON_IGNOREALL "CUI_HID_SPLDLG_BUTTON_IGNOREALL" +#define HID_SPLDLG_BUTTON_CHANGE "CUI_HID_SPLDLG_BUTTON_CHANGE" +#define HID_SPLDLG_BUTTON_CHANGEALL "CUI_HID_SPLDLG_BUTTON_CHANGEALL" +#define HID_SPLDLG_BUTTON_EXPLAIN "CUI_HID_SPLDLG_BUTTON_EXPLAIN" +#define HID_CHARMAP_CTL_SHOWSET "CUI_HID_CHARMAP_CTL_SHOWSET" +#define HID_CHARMAP_CTL_SHOWTEXT "CUI_HID_CHARMAP_CTL_SHOWTEXT" +#define HID_CHARMAP_CTL_SHOWCHAR "CUI_HID_CHARMAP_CTL_SHOWCHAR" +#define HID_DLG_NAME "CUI_HID_DLG_NAME" +#define HID_DLG_MESSBOX "CUI_HID_DLG_MESSBOX" +#define HID_HANGULDLG_SUGGESTIONS "CUI_HID_HANGULDLG_SUGGESTIONS" +#define HID_HANGULDLG_SUGGESTIONS_GRID "CUI_HID_HANGULDLG_SUGGESTIONS_GRID" +#define HID_HANGULDLG_SUGGESTIONS_LIST "CUI_HID_HANGULDLG_SUGGESTIONS_LIST" +#define HID_DLG_OBJECT_NAME "CUI_HID_DLG_OBJECT_NAME" +#define HID_DLG_OBJECT_TITLE_DESC "CUI_HID_DLG_OBJECT_TITLE_DESC" +#define HID_SVX_CONFIG_MENU_ORGANIZER "CUI_HID_SVX_CONFIG_MENU_ORGANIZER" +#define HID_SVX_CONFIG_ICON_SELECTOR "CUI_HID_SVX_CONFIG_ICON_SELECTOR" +#define HID_SVX_CONFIG_NAME_SUBMENU "CUI_HID_SVX_CONFIG_NAME_SUBMENU" +#define HID_SVX_CONFIG_RENAME_MENU "CUI_HID_SVX_CONFIG_RENAME_MENU" +#define HID_SVX_CONFIG_RENAME_MENU_ITEM "CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM" +#define HID_SVX_CONFIG_RENAME_TOOLBAR "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR" +#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM" +#define HID_SVX_NEW_TOOLBAR "CUI_HID_SVX_NEW_TOOLBAR" +#define HID_SVX_MODIFY_TOOLBAR "CUI_HID_SVX_MODIFY_TOOLBAR" +#define HID_SVX_NEW_TOOLBAR_ITEM "CUI_HID_SVX_NEW_TOOLBAR_ITEM" +#define HID_SVX_CONFIG_MENU_LISTBOX "CUI_HID_SVX_CONFIG_MENU_LISTBOX" +#define HID_SVX_MODIFY_TOOLBAR_ITEM "CUI_HID_SVX_MODIFY_TOOLBAR_ITEM" +#define HID_SVX_SAVE_IN "CUI_HID_SVX_SAVE_IN" +#define HID_OPTIONS_MULTIPATH_LIST "CUI_HID_OPTIONS_MULTIPATH_LIST" +#define HID_FM_DLG_SEARCH "CUI_HID_FM_DLG_SEARCH" +#define HID_SEARCH_TEXT "CUI_HID_SEARCH_TEXT" +#define HID_SEARCH_ALLFIELDS "CUI_HID_SEARCH_ALLFIELDS" +#define HID_GALLERY_PROPERTIES_GENERAL "CUI_HID_GALLERY_PROPERTIES_GENERAL" +#define HID_SEARCH_FIELDSELECTION "CUI_HID_SEARCH_FIELDSELECTION" +#define HID_SEARCH_POSITION "CUI_HID_SEARCH_POSITION" +#define HID_SEARCH_FORMATTER "CUI_HID_SEARCH_FORMATTER" +#define HID_SEARCH_CASE "CUI_HID_SEARCH_CASE" +#define HID_SEARCH_BACKWARD "CUI_HID_SEARCH_BACKWARD" +#define HID_SEARCH_STARTOVER "CUI_HID_SEARCH_STARTOVER" +#define HID_SEARCH_WILDCARD "CUI_HID_SEARCH_WILDCARD" +#define HID_SEARCH_REGULAR "CUI_HID_SEARCH_REGULAR" +#define HID_SEARCH_APPROX "CUI_HID_SEARCH_APPROX" +#define HID_SEARCH_APPROXSETTINGS "CUI_HID_SEARCH_APPROXSETTINGS" +#define HID_SEARCH_BTN_SEARCH "CUI_HID_SEARCH_BTN_SEARCH" +#define HID_SEARCH_BTN_CLOSE "CUI_HID_SEARCH_BTN_CLOSE" +#define HID_GALLERY_BROWSER "CUI_HID_GALLERY_BROWSER" +#define HID_GALLERY_SEARCH "CUI_HID_GALLERY_SEARCH" +#define HID_GALLERY_APPLY "CUI_HID_GALLERY_APPLY" +#define HID_SPLDLG_BUTTON_IGNORERULE "CUI_HID_SPLDLG_BUTTON_IGNORERULE" +#define HID_CONFIG_ACCEL "CUI_HID_CONFIG_ACCEL" +#define HID_ACCELCONFIG_LISTBOX "CUI_HID_ACCELCONFIG_LISTBOX" +#define HID_CONFIGGROUP_ACC_LISTBOX "CUI_HID_CONFIGGROUP_ACC_LISTBOX" +#define HID_CONFIGFUNCTION_ACC_LISTBOX "CUI_HID_CONFIGFUNCTION_ACC_LISTBOX" +#define HID_MACRO_LB_EVENT "CUI_HID_MACRO_LB_EVENT" +#define HID_MACRO_GROUP "CUI_HID_MACRO_GROUP" +#define HID_MACRO_MACROS "CUI_HID_MACRO_MACROS" +#define HID_DIALOG_HANGULHANJA "CUI_HID_DIALOG_HANGULHANJA" +#define HID_HANGULHANJA_OPT_DLG "CUI_HID_HANGULHANJA_OPT_DLG" +#define HID_HANGULHANJA_NEWDICT_DLG "CUI_HID_HANGULHANJA_NEWDICT_DLG" +#define HID_HANGULHANJA_EDIT_DLG "CUI_HID_HANGULHANJA_EDIT_DLG" +#define HID_HANGULHANJA_OPT_DICTS_LB "CUI_HID_HANGULHANJA_OPT_DICTS_LB" +#define HID_MULTIPATH "CUI_HID_MULTIPATH" +#define HID_SCRIPTORG_DIALOG "CUI_HID_SCRIPTORG_DIALOG" +#define HID_SCRIPTSBOX "CUI_HID_SCRIPTSBOX" +#define HID_SPELLCHECK "CUI_HID_SPELLCHECK" +#define HID_TPSIZE_CTRL "CUI_HID_TPSIZE_CTRL" +#define HID_TPROTATION_CTRL1 "CUI_HID_TPROTATION_CTRL1" +#define HID_TPROTATION_CTRL2 "CUI_HID_TPROTATION_CTRL2" +#define HID_TRANS_ANGLE "CUI_HID_TRANS_ANGLE" +#define HID_TPPOSITION_CTRL "CUI_HID_TPPOSITION_CTRL" +#define HID_NUMBERFORMAT_LB_FORMAT "CUI_HID_NUMBERFORMAT_LB_FORMAT" +#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW "CUI_HID_NUMBERFORMAT_WND_NUMBER_PREVIEW" +#define HID_TRANS_SLANT "CUI_HID_TRANS_SLANT" +#define HID_TPHATCH_CTRL "CUI_HID_TPHATCH_CTRL" +#define HID_SEARCHATTR_CTL_ATTR "CUI_HID_SEARCHATTR_CTL_ATTR" +#define HID_NUMBERFORMAT_TBI_INFO "CUI_HID_NUMBERFORMAT_TBI_INFO" +#define HID_SEARCHATTR "CUI_HID_SEARCHATTR" +#define HID_ALIGNMENT_CTR_DIAL "CUI_HID_ALIGNMENT_CTR_DIAL" +#define HID_ALIGNMENT_CTR_BORDER_LOCK "CUI_HID_ALIGNMENT_CTR_BORDER_LOCK" +#define HID_SEARCHSIMILARITY "CUI_HID_SEARCHSIMILARITY" +#define UID_SEARCH_RECORDSTATUS "CUI_UID_SEARCH_RECORDSTATUS" +#define HID_OFAPAGE_AUTOCORR_CLB "CUI_HID_OFAPAGE_AUTOCORR_CLB" +#define HID_AUTOCORR_LANGUAGE "CUI_HID_AUTOCORR_LANGUAGE" +#define HID_OFAPAGE_AUTOFORMAT_CLB "CUI_HID_OFAPAGE_AUTOFORMAT_CLB" +#define HID_TPCOLOR_RGB_1 "CUI_HID_TPCOLOR_RGB_1" +#define HID_TPCOLOR_RGB_2 "CUI_HID_TPCOLOR_RGB_2" +#define HID_TPCOLOR_RGB_3 "CUI_HID_TPCOLOR_RGB_3" +#define HID_TPCOLOR_CMYK_1 "CUI_HID_TPCOLOR_CMYK_1" +#define HID_TPCOLOR_CMYK_2 "CUI_HID_TPCOLOR_CMYK_2" +#define HID_TPCOLOR_CMYK_3 "CUI_HID_TPCOLOR_CMYK_3" +#define HID_ALIGNMENT "CUI_HID_ALIGNMENT" +#define HID_OFAPAGE_AUTOCORR_OPTIONS "CUI_HID_OFAPAGE_AUTOCORR_OPTIONS" +#define HID_OFAPAGE_AUTOFMT_OPTIONS "CUI_HID_OFAPAGE_AUTOFMT_OPTIONS" +#define HID_OFAPAGE_AUTOCORR_REPLACE "CUI_HID_OFAPAGE_AUTOCORR_REPLACE" +#define HID_OFACTL_AUTOCORR_REPLACE "CUI_HID_OFACTL_AUTOCORR_REPLACE" +#define HID_OFAPAGE_AUTOCORR_EXCEPT "CUI_HID_OFAPAGE_AUTOCORR_EXCEPT" +#define HID_OFAPAGE_AUTOCORR_QUOTE "CUI_HID_OFAPAGE_AUTOCORR_QUOTE" +#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS "CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS" +#define HID_BACKGROUND "CUI_HID_BACKGROUND" +#define HID_BACKGROUND_CTL_BGDCOLORSET "CUI_HID_BACKGROUND_CTL_BGDCOLORSET" +#define HID_BACKGROUND_CTL_POSITION "CUI_HID_BACKGROUND_CTL_POSITION" +#define HID_BORDER "CUI_HID_BORDER" +#define HID_BORDER_CTL_PRESETS "CUI_HID_BORDER_CTL_PRESETS" +#define HID_BORDER_CTL_SHADOWS "CUI_HID_BORDER_CTL_SHADOWS" +#define HID_PAGE_CONNECTION "CUI_HID_PAGE_CONNECTION" +#define HID_PAGE_CONNECTION_CTL_PREVIEW "CUI_HID_PAGE_CONNECTION_CTL_PREVIEW" +#define HID_PAGE_DISTRIBUTE "CUI_HID_PAGE_DISTRIBUTE" +#define HID_SVXPAGE_GRFCROP "CUI_HID_SVXPAGE_GRFCROP" +#define HID_CAPTION "CUI_HID_CAPTION" +#define HID_CAPTION_CTL_TYPE "CUI_HID_CAPTION_CTL_TYPE" +#define HID_PAGE_MEASURE "CUI_HID_PAGE_MEASURE" +#define HID_MEASURE_CTL_POSITION "CUI_HID_MEASURE_CTL_POSITION" +#define HID_NUMBERFORMAT "CUI_HID_NUMBERFORMAT" +#define HID_NUMBERFORMAT_TBI_ADD "CUI_HID_NUMBERFORMAT_TBI_ADD" +#define HID_NUMBERFORMAT_TBI_REMOVE "CUI_HID_NUMBERFORMAT_TBI_REMOVE" +#define HID_FORMAT_PAGE "CUI_HID_FORMAT_PAGE" +#define HID_REDLINING_DLG "CUI_HID_REDLINING_DLG" +#define HID_REDLINING_EDIT "CUI_HID_REDLINING_EDIT" +#define HID_REDLINING_PREV "CUI_HID_REDLINING_PREV" +#define HID_REDLINING_NEXT "CUI_HID_REDLINING_NEXT" +#define HID_FORMAT_PARAGRAPH_STD "CUI_HID_FORMAT_PARAGRAPH_STD" +#define HID_VALUESET_SINGLENUM "CUI_HID_VALUESET_SINGLENUM" +#define HID_VALUESET_BULLET "CUI_HID_VALUESET_BULLET" +#define HID_VALUESET_NUM "CUI_HID_VALUESET_NUM" +#define HID_VALUESET_NUMBMP "CUI_HID_VALUESET_NUMBMP" +#define HID_SVXPAGE_PICK_NUM "CUI_HID_SVXPAGE_PICK_NUM" +#define HID_SVXPAGE_PICK_SINGLE_NUM "CUI_HID_SVXPAGE_PICK_SINGLE_NUM" +#define HID_SVXPAGE_PICK_BMP "CUI_HID_SVXPAGE_PICK_BMP" +#define HID_SVXPAGE_PICK_BULLET "CUI_HID_SVXPAGE_PICK_BULLET" +#define HID_SVXPAGE_NUM_OPTIONS "CUI_HID_SVXPAGE_NUM_OPTIONS" +#define HID_SVXPAGE_NUM_POSITION "CUI_HID_SVXPAGE_NUM_POSITION" +#define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW" +#define HID_FORMAT_PARAGRAPH_EXT "CUI_HID_FORMAT_PARAGRAPH_EXT" +#define HID_FORMAT_PARAGRAPH_ALIGN "CUI_HID_FORMAT_PARAGRAPH_ALIGN" +#define HID_SVXPAGE_PARA_ASIAN "CUI_HID_SVXPAGE_PARA_ASIAN" +#define HID_SVXPAGE_SWPOSSIZE "CUI_HID_SVXPAGE_SWPOSSIZE" +#define HID_AREA_TRANSPARENCE "CUI_HID_AREA_TRANSPARENCE" +#define HID_AREA_AREA "CUI_HID_AREA_AREA" +#define HID_AREA_SHADOW "CUI_HID_AREA_SHADOW" +#define HID_AREA_HATCH "CUI_HID_AREA_HATCH" +#define HID_AREA_BITMAP "CUI_HID_AREA_BITMAP" +#define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL" +#define HID_AREA_GRADIENT "CUI_HID_AREA_GRADIENT" +#define HID_LINE_ENDDEF "CUI_HID_LINE_ENDDEF" +#define HID_LINE_LINE "CUI_HID_LINE_LINE" +#define HID_LINE_DEF "CUI_HID_LINE_DEF" +#define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD" +#define HID_TABULATOR "CUI_HID_TABULATOR" +#define HID_PAGE_TEXTATTR "CUI_HID_PAGE_TEXTATTR" +#define HID_TEXTATTR_CTL_POSITION "CUI_HID_TEXTATTR_CTL_POSITION" +#define HID_TRANS_POSITION_SIZE "CUI_HID_TRANS_POSITION_SIZE" +#define HID_HYPHENATE "CUI_HID_HYPHENATE" +#define HID_SVXPAGE_CHAR_NAME "CUI_HID_SVXPAGE_CHAR_NAME" +#define HID_SVXPAGE_CHAR_EFFECTS "CUI_HID_SVXPAGE_CHAR_EFFECTS" +#define HID_SVXPAGE_CHAR_POSITION "CUI_HID_SVXPAGE_CHAR_POSITION" +#define HID_HYPERLINK_INTERNET "CUI_HID_HYPERLINK_INTERNET" +#define HID_HYPERLINK_MAIL "CUI_HID_HYPERLINK_MAIL" +#define HID_HYPERLINK_DOCUMENT "CUI_HID_HYPERLINK_DOCUMENT" +#define HID_HYPERLINK_NEWDOCUMENT "CUI_HID_HYPERLINK_NEWDOCUMENT" +#define HID_HYPERLINK_MARKWND "CUI_HID_HYPERLINK_MARKWND" +#define HID_ICCDIALOG_RESET_BTN "CUI_HID_ICCDIALOG_RESET_BTN" +#define HID_ICCDIALOG_CHOICECTRL "CUI_HID_ICCDIALOG_CHOICECTRL" +#define HID_HYPERDLG_INET_PATH "CUI_HID_HYPERDLG_INET_PATH" +#define HID_HYPERDLG_MAIL_PATH "CUI_HID_HYPERDLG_MAIL_PATH" +#define HID_HYPERDLG_DOC_PATH "CUI_HID_HYPERDLG_DOC_PATH" +#define HID_ICCDIALOG_OK_BTN "CUI_HID_ICCDIALOG_OK_BTN" +#define HID_ICCDIALOG_CANCEL_BTN "CUI_HID_ICCDIALOG_CANCEL_BTN" +#define HID_HYPERLINK_MARKWND_APPLY "CUI_HID_HYPERLINK_MARKWND_APPLY" +#define HID_HYPERLINK_MARKWND_CLOSE "CUI_HID_HYPERLINK_MARKWND_CLOSE" +#define HID_HYPERLINK_MARKWND_TREE "CUI_HID_HYPERLINK_MARKWND_TREE" +#define HID_SVXPAGE_CHAR_TWOLINES "CUI_HID_SVXPAGE_CHAR_TWOLINES" +#define HID_GRFFILTER_EMBOSS_LIGHT "CUI_HID_GRFFILTER_EMBOSS_LIGHT" +#define HID_PASTE_DLG "CUI_HID_PASTE_DLG" +#define HID_LINKDLG_TABLB "CUI_HID_LINKDLG_TABLB" +#define HID_MACRO_HEADERTABLISTBOX "CUI_HID_MACRO_HEADERTABLISTBOX" +#define HID_GALLERY_ENTER_TITLE "CUI_HID_GALLERY_ENTER_TITLE" +#define HID_GALLERY_TITLE_EDIT "CUI_HID_GALLERY_TITLE_EDIT" +#define HID_THES_LANGUAGE "CUI_HID_THES_LANGUAGE" +#define HID_OFAPAGE_QUOTE_SW_CLB "CUI_HID_OFAPAGE_QUOTE_SW_CLB" +#define HID_OFAPAGE_QUOTE_CLB "CUI_HID_OFAPAGE_QUOTE_CLB" +#define HID_POSTIT_DIALOG "CUI_HID_POSTIT_DIALOG" +#define HID_CT_THES_ALTERNATIVES "CUI_HID_CT_THES_ALTERNATIVES" -#define HID_DLG_PASSWORD_TO_OPEN_MODIFY (HID_CUI_START + 342) -#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN (HID_CUI_START + 343) -#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN (HID_CUI_START + 344) -#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE (HID_CUI_START + 345) -#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY (HID_CUI_START + 346) -#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY (HID_CUI_START + 347) -#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY (HID_CUI_START + 348) -#define HID_HYPERLINK_DIALOG (HID_CUI_START + 349) - -// please adjust ACT_SVX_HID_END2 below if you add entries here! - -// ----------------------------------------------------------------------- -// Overrun check --------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_CUI_HID_END (HID_CUI_START + 349) - -#if ACT_CUI_HID_END > HID_CUI_END -#error Resource-Ueberlauf in #line, #file -#endif +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY" +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN" +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN" +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE" +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY" +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY" +#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY" +#define HID_HYPERLINK_DIALOG "CUI_HID_HYPERLINK_DIALOG" #endif diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 77e4a5df7..a5ed2527c 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -53,8 +53,6 @@ private: DECL_LINK (ClickNewHdl_Impl , void * ); // Button : New Image GetImage( USHORT nId ); - void ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder);//, String* pFrame, String* pOpenAs, String* pDefTempl, String* pDefURL ); - //String ReadURL_Impl( Config& rURLFile, const DirEntry& rFile ); protected: void FillDlgFields ( String& aStrURL ); diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index d756588a6..4efc355c7 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -116,8 +116,6 @@ protected : USHORT GetSlot( USHORT nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } USHORT GetWhich( USHORT nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); } - const SfxPoolItem* GetOldItem( const SfxItemSet& rSet, USHORT nSlot ); - const SfxPoolItem* GetExchangeItem( const SfxItemSet& rSet, USHORT nSlot ); public : virtual ~IconChoicePage(); @@ -148,8 +146,6 @@ public : virtual BOOL IsReadOnly() const; virtual sal_Bool QueryClose(); - static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot ); - void StateChanged( StateChangedType nType ); void DataChanged( const DataChangedEvent& rDCEvt ); }; @@ -221,7 +217,6 @@ protected : void ResetPageImpl (); short Ok(); - BOOL IsInOK() const; public : @@ -242,17 +237,10 @@ public : // SvxIconChoiceCtrlEntry* AddTabPage( - USHORT nId, const String& rIconText, const Image& rChoiceIcon, - CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/, - BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND ); - - SvxIconChoiceCtrlEntry* AddTabPage( USHORT nId, const String& rIconText, const Image& rChoiceIcon, const Image& rChoiceIconHC, CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/, BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND ); - void RemoveTabPage( USHORT nId ); - void SetCurPageId( USHORT nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); } USHORT GetCurPageId() const { return mnCurrentPageId; } void ShowPage( USHORT nId ); @@ -261,8 +249,6 @@ public : const USHORT* GetInputRanges( const SfxItemPool& ); void SetInputSet( const SfxItemSet* pInSet ); const SfxItemSet* GetOutputItemSet() const { return pOutSet; } - const SfxItemSet* GetOutputItemSet( USHORT nId ); - int FillOutputItemSet(); const OKButton& GetOKButton() const { return aOKBtn; } OKButton& GetOKButton() { return aOKBtn; } @@ -271,18 +257,13 @@ public : const HelpButton& GetHelpButton() const { return aHelpBtn; } HelpButton& GetHelpButton() { return aHelpBtn; } - void RemoveResetButton(); - short Execute(); void Start( BOOL bShow = TRUE ); sal_Bool QueryClose(); const SfxItemSet* GetExampleSet() const { return pExampleSet; } - void SetCtrlColor ( const Color& rColor ); EIconChoicePos SetCtrlPos ( const EIconChoicePos& rPos ); - - void CreateIconTextAutoMnemonics( void ); }; #endif //_ICCDLG_HXX diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 8930228eb..4ff1e1261 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -89,8 +89,6 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl BOOL IsCreateNew() const { return aRbNewObject.IsChecked(); } public: - static void FillObjectServerList( SvObjectServerList* ); - SvInsertOleDlg( Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage, const SvObjectServerList* pServers = NULL ); diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index e1e11937f..adaa4b0d8 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -57,7 +57,7 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog bool bColumn; public: - SvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ); + SvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ); virtual short Execute(void); diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 688993e51..55fe62b24 100755..100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -60,7 +60,6 @@ class _SfxMacroTabPage : public SfxTabPage DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton * ); DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, ChangeScriptHdl_Impl, RadioButton * ); - DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit* ); DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer* ); protected: @@ -86,19 +85,11 @@ public: virtual void ScriptChanged( const String& rLanguage ); virtual void PageCreated (SfxAllItemSet aSet); - // zum setzen / abfragen der Links - void SetGetRangeLink( FNGetRangeHdl pFn ); - FNGetRangeHdl GetGetRangeLink() const; - void SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn ); - FNGetMacrosOfRangeHdl GetGetMacrosOfRangeLink() const; - // --------- Erben aus der Basis ------------- virtual BOOL FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - void SetReadOnly( BOOL bSet ); BOOL IsReadOnly() const; - void SelectEvent( const String& rEventName, USHORT nEventId ); }; inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const diff --git a/cui/source/inc/optimprove.hxx b/cui/source/inc/optimprove.hxx index f984f798c..f7f4b12a0 100644 --- a/cui/source/inc/optimprove.hxx +++ b/cui/source/inc/optimprove.hxx @@ -36,14 +36,6 @@ #include <sfx2/basedlgs.hxx> #include <sfx2/tabdlg.hxx> -// class SvxEmptyPage ---------------------------------------------------- - -class SvxEmptyPage : public TabPage -{ -public: - SvxEmptyPage( Window* pParent ); -}; - // class SvxImprovementPage ---------------------------------------------- class SvxImprovementPage : public TabPage @@ -105,7 +97,6 @@ public: virtual ~SvxImprovementOptionsPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static sal_uInt16* GetRanges(); virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); @@ -123,16 +114,5 @@ public: SvxImprovementDialog( Window* pParent, const String& rInfoURL ); }; -class SvxInfoWindow : public Window -{ -private: - FixedText m_aInfoText; - -public: - SvxInfoWindow( Window* pParent, const ResId& rResId ); - - void SetInfoText( const String& rText ); -}; - #endif diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 56a7f0025..806875ff3 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -135,7 +135,6 @@ public: void SetPageWidth( USHORT nPageWidth ); - void SetMaxDistance( USHORT nMaxDist ); void EnableRelativeMode(); void EnableRegisterMode(); void EnableAutoFirstLine(); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 709a8936e..acd537971 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -97,13 +97,7 @@ protected: void ExpandTree( SvLBoxEntry* pRootEntry ); virtual void RequestingChilds( SvLBoxEntry* pParent ); virtual void ExpandedHdl(); - SvLBoxEntry* FindEntry( SvLBoxEntry* pParent, const String& rText, BYTE nType ); virtual long ExpandingHdl(); - static BOOL dialogSort1( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1, - com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 ); - static BOOL dialogSort2( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1, - com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 ); - public: void Init( const ::rtl::OUString& language ); void RequestSubEntries( SvLBoxEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, @@ -111,8 +105,6 @@ public: SFTreeListBox( Window* pParent, const ResId& rRes ); ~SFTreeListBox(); - void UpdateEntries(); - void ExpandAllTrees(); @@ -202,15 +194,12 @@ protected: BOOL getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName ); void CheckButtons( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName ); - void createEntry( SvLBoxEntry* pEntry ); void renameEntry( SvLBoxEntry* pEntry ); void deleteEntry( SvLBoxEntry* pEntry ); ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > getBrowseNode( SvLBoxEntry* pEntry ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel( SvLBoxEntry* pEntry ); - void EnableButton( Button& rButton, BOOL bEnable ); String getListOfChildren( ::com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node, int depth ); void StoreCurrentSelection(); void RestorePreviousSelection(); diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 7381d19df..e6f498695 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -115,13 +115,8 @@ public: SvxConfigFunctionListBox_Impl( Window*, const ResId& ); ~SvxConfigFunctionListBox_Impl(); void ClearAll(); - SvLBoxEntry* GetEntry_Impl( USHORT nId ); - SvLBoxEntry* GetEntry_Impl( const String& ); - USHORT GetId( SvLBoxEntry *pEntry ); String GetHelpText( SvLBoxEntry *pEntry ); using Window::GetHelpText; - USHORT GetCurId() - { return GetId( FirstSelected() ); } SvLBoxEntry* GetLastSelectedEntry(); void FunctionSelected(); @@ -235,7 +230,6 @@ public: void SetImageProvider( ImageProvider* provider ) { aCategories.SetImageProvider( provider ); } - USHORT GetSelectedId(); String GetScriptURL() const; String GetSelectedDisplayName(); String GetSelectedHelpText(); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 2689c0030..c337c17cd 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -336,12 +336,6 @@ private: public: ExtensionsTabPage( - Window* pParent, const ResId&, - const rtl::OUString& rPageURL, const rtl::OUString& rEvtHdl, - const com::sun::star::uno::Reference< - com::sun::star::awt::XContainerWindowProvider >& rProvider ); - - ExtensionsTabPage( Window* pParent, WinBits nStyle, const rtl::OUString& rPageURL, const rtl::OUString& rEvtHdl, const com::sun::star::uno::Reference< @@ -354,6 +348,5 @@ public: void ResetPage(); void SavePage(); - void HideWindow(); }; diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index d47c2347f..79092ee4b 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -99,16 +99,13 @@ public: SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ); ~SvxZoomDialog(); - static USHORT* GetRanges(); const SfxItemSet* GetOutputItemSet() const { return pOutSet; } USHORT GetFactor() const; void SetFactor( USHORT nNewFactor, USHORT nBtnId = 0 ); - void SetButtonText( USHORT nBtnId, const String& aNewTxt ); void HideButton( USHORT nBtnId ); void SetLimits( USHORT nMin, USHORT nMax ); - void SetSpinSize( USHORT nNewSpin ); }; #include <layout/layout-post.hxx> diff --git a/cui/source/options/connpooloptions.src b/cui/source/options/connpooloptions.src index cd4cad5f1..64aa376a7 100644 --- a/cui/source/options/connpooloptions.src +++ b/cui/source/options/connpooloptions.src @@ -35,7 +35,7 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS { - // HelpId = ; + HelpID = "cui:TabPage:RID_OFAPAGE_CONNPOOLOPTIONS"; OutputSize = TRUE ; Size = MAP_APPFONT ( PAGE_SIZE_X, PAGE_SIZE_Y ) ; SVLook = TRUE ; @@ -49,6 +49,7 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS }; CheckBox CB_POOL_CONNS { + HelpID = "cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_POOL_CONNS"; Pos = MAP_APPFONT( 7, 15 ); Size = MAP_APPFONT( PAGE_SIZE_X - 14, 10 ); Text [ en-US ] = "Connection pooling enabled"; @@ -80,6 +81,7 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS }; CheckBox CB_DRIVERPOOLING { + HelpID = "cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_DRIVERPOOLING"; Pos = MAP_APPFONT( 17, 39 + LIST_SIZE_Y + 4 + 8 + 3 ); Size = MAP_APPFONT( PAGE_SIZE_X - 23, 10 ); Text [ en-US ] = "Enable pooling for this driver"; @@ -92,6 +94,7 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS }; NumericField NF_TIMEOUT { + HelpID = "cui:NumericField:RID_OFAPAGE_CONNPOOLOPTIONS:NF_TIMEOUT"; Pos = MAP_APPFONT( 27 + 100 + 3, 39 + LIST_SIZE_Y + 4 + 8 + 3 + 10 + 3 ); Size = MAP_APPFONT( 40, 12 ); SvLook = TRUE; diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index 610cb2512..75f0cad8e 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -39,13 +39,6 @@ namespace offapp //= DriverPooling //==================================================================== //-------------------------------------------------------------------- - DriverPooling::DriverPooling() - :bEnabled(sal_False) - ,nTimeoutSeconds(0) - { - } - - //-------------------------------------------------------------------- DriverPooling::DriverPooling( const String& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout ) :sName(_rName) ,bEnabled(_bEnabled) diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index a1e73443d..910eab82d 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -46,7 +46,6 @@ namespace offapp sal_Bool bEnabled; sal_Int32 nTimeoutSeconds; - DriverPooling(); DriverPooling( const String& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout ); sal_Bool operator == (const DriverPooling& _rR) const; diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index df48317a5..2dab110b6 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -92,9 +92,3 @@ INT32 SvxJSearchOptionsDialog::GetTransliterationFlags() const { return pPage->GetTransliterationFlags(); } - - -void SvxJSearchOptionsDialog::SetTransliterationFlags( INT32 nSettings ) -{ - pPage->SetTransliterationFlags( nSettings ); -} diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index f73435fce..51d941b44 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -425,60 +425,6 @@ void DbRegistrationOptionsPage::insertNewEntry( const ::rtl::OUString& _sName,co } // ----------------------------------------------------------------------------- -String DbRegistrationOptionsPage::getFileLocation(const String& _sLocation) -{ - try - { - rtl::OUString aService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ); - Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); - Reference < XFilePicker > xFilePicker( xFactory->createInstance( aService ), UNO_QUERY ); - OSL_ENSURE(xFilePicker.is() ,"Could create file picker service!"); - Reference < XFilterManager> xFilterManager(xFilePicker,UNO_QUERY); - static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)"); - const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType); - if ( pFilter ) - { - xFilterManager->appendFilter( pFilter->GetUIName(),pFilter->GetDefaultExtension()); - xFilterManager->setCurrentFilter(pFilter->GetUIName()); - } - - INetURLObject aURL( _sLocation, INET_PROT_FILE ); - xFilePicker->setMultiSelectionMode(sal_False); - xFilePicker->setDisplayDirectory( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); - short nRet = xFilePicker->execute(); - - if ( ExecutableDialogResults::OK == nRet ) - { - - // old path is an URL? - INetURLObject aObj( _sLocation ); - FASTBOOL bURL = ( aObj.GetProtocol() != INET_PROT_NOT_VALID ); - Sequence< ::rtl::OUString > aFiles = xFilePicker->getFiles(); - INetURLObject aNewObj( aFiles[0] ); - aNewObj.removeFinalSlash(); - - // then the new path also an URL else system path - String sNewLocation = bURL ? rtl::OUString(aFiles[0]) : aNewObj.getFSysPath( INetURLObject::FSYS_DETECT ); - - if ( -#ifdef UNX - // Unix is case sensitive - ( sNewLocation != _sLocation ) -#else - ( sNewLocation.CompareIgnoreCaseToAscii( _sLocation ) != COMPARE_EQUAL ) -#endif - ) - return sNewLocation; - } - } - catch( Exception& ) - { - DBG_ERRORFILE( "DbRegistrationOptionsPage::EditLocationHdl: exception from folder picker" ); - } - - return String(); -} -// ----------------------------------------------------------------------------- void DbRegistrationOptionsPage::openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvLBoxEntry* _pEntry) { ODocumentLinkDialog aDlg(this,_pEntry == NULL); diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src index 7da53884d..88cd8e4df 100644 --- a/cui/source/options/dbregister.src +++ b/cui/source/options/dbregister.src @@ -34,7 +34,7 @@ #define STD_MASKCOLOR Color { Red=0xffff; Green=0x0000; Blue=0xffff; } TabPage RID_SFXPAGE_DBREGISTER { - // HelpId = HID_OPTIONS_DBREGISTER ; + HelpId = "cui:TabPage:RID_SFXPAGE_DBREGISTER" ; OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; @@ -64,18 +64,21 @@ TabPage RID_SFXPAGE_DBREGISTER }; PushButton BTN_NEW { + HelpID = "cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_NEW"; Pos = MAP_APPFONT ( 47 , 165 ) ; Size = MAP_APPFONT ( 65 , 14 ) ; Text [ en-US ] = "~New..." ; }; PushButton BTN_EDIT { + HelpID = "cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_EDIT"; Pos = MAP_APPFONT ( 183 , 165 ) ; Size = MAP_APPFONT ( 65 , 14 ) ; Text [ en-US ] = "~Edit..." ; }; PushButton BTN_DELETE { + HelpID = "cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_DELETE"; Pos = MAP_APPFONT ( 115 , 165 ) ; Size = MAP_APPFONT ( 65 , 14 ) ; Text [ en-US ] = "~Delete" ; diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src index eb3dadcde..e0bd02390 100644 --- a/cui/source/options/doclinkdialog.src +++ b/cui/source/options/doclinkdialog.src @@ -46,6 +46,7 @@ ModalDialog DLG_DOCUMENTLINK { + HelpID = "cui:ModalDialog:DLG_DOCUMENTLINK"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( DIALOG_SIZE_X , DIALOG_SIZE_Y ) ; @@ -64,6 +65,7 @@ ModalDialog DLG_DOCUMENTLINK }; ComboBox CMB_URL { + HelpID = "cui:ComboBox:DLG_DOCUMENTLINK:CMB_URL"; Pos = MAP_APPFONT ( 6 , LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 3) ; Size = MAP_APPFONT ( DIALOG_SIZE_X - 3*LINE_1_Y - BUTTON_SIZE_X , HEIGHT_EDIT ) ; @@ -75,6 +77,7 @@ ModalDialog DLG_DOCUMENTLINK }; PushButton PB_BROWSEFILE { + HelpID = "cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE"; Pos = MAP_APPFONT ( DIALOG_SIZE_X - BUTTON_SIZE_X - 6 , LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 4) ; Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ); Text [ en-US ] = "~Browse..."; @@ -90,6 +93,7 @@ ModalDialog DLG_DOCUMENTLINK }; Edit ET_NAME { + HelpID = "cui:Edit:DLG_DOCUMENTLINK:ET_NAME"; Pos = MAP_APPFONT ( 6, LINE_1_Y + 3*OFFSET_Y + 2*HEIGHT_LABEL + BUTTON_SIZE_Y - 6) ; Size = MAP_APPFONT ( DIALOG_SIZE_X - 3*LINE_1_Y - BUTTON_SIZE_X , HEIGHT_EDIT ) ; TabStop = TRUE ; diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src index 0d4bce1c9..7d223a87a 100644 --- a/cui/source/options/fontsubs.src +++ b/cui/source/options/fontsubs.src @@ -49,6 +49,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION Size = MAP_APPFONT ( 260 , 185 ) ; CheckBox CB_USETABLE { + HelpID = "cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE"; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 248 , 10 ) ; TabStop = TRUE ; @@ -63,6 +64,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION }; ComboBox CB_FONT1 { + HelpID = "cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 33 ) ; Size = MAP_APPFONT ( 100 , 100 ) ; @@ -82,6 +84,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION }; ComboBox CB_FONT2 { + HelpID = "cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2"; Border = TRUE ; Pos = MAP_APPFONT ( 110 , 33 ) ; Size = MAP_APPFONT ( 100 , 100 ) ; @@ -145,6 +148,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION }; ListBox LB_FONTNAME { + HelpID = "cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME"; Pos = MAP_APPFONT ( 65 , 140 ) ; Size = MAP_APPFONT ( 100 , 68 ) ; Border = TRUE ; @@ -153,6 +157,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION }; CheckBox CB_NONPROP { + HelpID = "cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP"; Pos = MAP_APPFONT ( 65 , 155 ) ; Size = MAP_APPFONT ( 180 , 10 ) ; TabStop = TRUE ; @@ -166,6 +171,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION }; ListBox LB_FONTHEIGHT { + HelpID = "cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT"; Pos = MAP_APPFONT ( 65 , 169 ) ; Size = MAP_APPFONT ( 30 , 68 ) ; Border = TRUE ; diff --git a/cui/source/options/internationaloptions.src b/cui/source/options/internationaloptions.src index 9e804b34e..39892a794 100644 --- a/cui/source/options/internationaloptions.src +++ b/cui/source/options/internationaloptions.src @@ -32,6 +32,7 @@ TabPage RID_OFA_TP_INTERNATIONAL { + HelpID = "cui:TabPage:RID_OFA_TP_INTERNATIONAL"; OutputSize = TRUE ; Size = MAP_APPFONT ( PAGE_SIZE_X, PAGE_SIZE_Y ) ; SVLook = TRUE ; @@ -46,6 +47,7 @@ TabPage RID_OFA_TP_INTERNATIONAL RadioButton RB_TXTDIR_LEFT2RIGHT { + HelpID = "cui:RadioButton:RID_OFA_TP_INTERNATIONAL:RB_TXTDIR_LEFT2RIGHT"; Pos = MAP_APPFONT( COL_1, ROW_1 ); Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_RB ); Group = TRUE; @@ -54,6 +56,7 @@ TabPage RID_OFA_TP_INTERNATIONAL RadioButton RB_TXTDIR_RIGHT2LEFT { + HelpID = "cui:RadioButton:RID_OFA_TP_INTERNATIONAL:RB_TXTDIR_RIGHT2LEFT"; Pos = MAP_APPFONT( COL_1, ROW_2 ); Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_RB ); Text [ en-US ] = "~Right-to-left"; @@ -68,6 +71,7 @@ TabPage RID_OFA_TP_INTERNATIONAL CheckBox CB_SHTVW_RIGHT2LEFT { + HelpID = "cui:CheckBox:RID_OFA_TP_INTERNATIONAL:CB_SHTVW_RIGHT2LEFT"; Pos = MAP_APPFONT( COL_1, ROW_4 ); Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_CB ); Text [ en-US ] = "Right-~to-left"; @@ -75,6 +79,7 @@ TabPage RID_OFA_TP_INTERNATIONAL CheckBox CB_SHTVW_CURRENTDOCONLY { + HelpID = "cui:CheckBox:RID_OFA_TP_INTERNATIONAL:CB_SHTVW_CURRENTDOCONLY"; Pos = MAP_APPFONT( COL_2, ROW_5 ); Size = MAP_APPFONT( WIDTH2END( COL_2 ), HEIGHT_CB ); Text [ en-US ] = "~Current document only"; diff --git a/cui/source/options/optaccessibility.src b/cui/source/options/optaccessibility.src index 36a4cad63..0008987a3 100644 --- a/cui/source/options/optaccessibility.src +++ b/cui/source/options/optaccessibility.src @@ -44,6 +44,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG }; CheckBox CB_ACCESSIBILITY_TOOL { + HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ACCESSIBILITY_TOOL"; TabStop = TRUE ; Pos = MAP_APPFONT( COL1, ROWA_1 ); Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); @@ -52,6 +53,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG }; CheckBox CB_TEXTSELECTION { + HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TEXTSELECTION"; TabStop = TRUE ; Pos = MAP_APPFONT( COL1, ROWA_2 ); Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); @@ -59,6 +61,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG }; CheckBox CB_ANIMATED_GRAPHICS { + HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_GRAPHICS"; TabStop = TRUE ; Pos = MAP_APPFONT( COL1, ROWA_3 ); Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); @@ -66,6 +69,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG }; CheckBox CB_ANIMATED_TEXTS { + HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_TEXTS"; TabStop = TRUE ; Pos = MAP_APPFONT( COL1, ROWA_4 ); Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); @@ -73,6 +77,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG }; CheckBox CB_TIPHELP { + HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TIPHELP"; TabStop = TRUE ; Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT( ROWA_5 ) ); Size = MAP_APPFONT( DIFF(COL2,COL3), RSC_CD_CHECKBOX_HEIGHT ); @@ -80,6 +85,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG }; NumericField NF_TIPHELP { + HelpID = "cui:NumericField:RID_SVXPAGE_ACCESSIBILITYCONFIG:NF_TIPHELP"; TabStop = TRUE ; Border = TRUE ; Pos = MAP_APPFONT( COL3, ROWA_5 ); @@ -105,6 +111,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG }; CheckBox CB_AUTO_DETECT_HC { + HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTO_DETECT_HC"; TabStop = TRUE ; Pos = MAP_APPFONT( COL1, ROWB_1 ); Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); @@ -112,6 +119,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG }; CheckBox CB_AUTOMATIC_FONT_COLOR { + HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTOMATIC_FONT_COLOR"; TabStop = TRUE ; Pos = MAP_APPFONT( COL1, ROWB_2 ); Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); @@ -119,6 +127,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG }; CheckBox CB_PAGE_PREVIEWS { + HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_PAGE_PREVIEWS"; TabStop = TRUE ; Pos = MAP_APPFONT( COL1, ROWB_3 ); Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src index ee735f906..fa5ebcfc1 100644 --- a/cui/source/options/optasian.src +++ b/cui/source/options/optasian.src @@ -45,12 +45,14 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT }; RadioButton RB_CHAR_KERNING { + HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_KERNING"; Pos = MAP_APPFONT ( 12, 14 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; Text [ en-US ] = "~Western characters only"; }; RadioButton RB_CHAR_PUNCT { + HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_PUNCT"; Pos = MAP_APPFONT ( 12, 27 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; Text [ en-US ] = "Western ~text and Asian punctuation"; @@ -63,18 +65,21 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT }; RadioButton RB_NO_COMP { + HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_NO_COMP"; Pos = MAP_APPFONT ( 12, 54 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; Text [ en-US ] = "~No compression"; }; RadioButton RB_PUNCT_COMP { + HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_COMP"; Pos = MAP_APPFONT ( 12, 67) ; Size = MAP_APPFONT ( 200 , 10 ) ; Text [ en-US ] = "~Compress punctuation only"; }; RadioButton RB_PUNCT_KANA_COMP { + HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_KANA_COMP"; Pos = MAP_APPFONT ( 12, 80 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; Text [ en-US ] = "Compress ~punctuation and Japanese Kana"; @@ -93,6 +98,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT }; ListBox LB_LANGUAGE { + HelpID = "cui:ListBox:RID_SVXPAGE_ASIAN_LAYOUT:LB_LANGUAGE"; Pos = MAP_APPFONT ( 95 , 107 ) ; Size = MAP_APPFONT ( 80 , 48 ) ; Border = TRUE ; @@ -100,6 +106,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT }; CheckBox CB_STANDARD { + HelpID = "cui:CheckBox:RID_SVXPAGE_ASIAN_LAYOUT:CB_STANDARD"; Pos = MAP_APPFONT ( 180, 109 ) ; Size = MAP_APPFONT ( 74 , 10 ) ; Text [ en-US ] = "~Default"; @@ -112,6 +119,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT }; Edit ED_START { + HelpID = "cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_START"; Pos = MAP_APPFONT ( 95 , 123 ) ; Size = MAP_APPFONT ( 159 , 12 ) ; Border = TRUE ; @@ -124,6 +132,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT }; Edit ED_END { + HelpID = "cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_END"; Pos = MAP_APPFONT ( 95 , 139 ) ; Size = MAP_APPFONT ( 159 , 12 ) ; Border = TRUE ; diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src index 32a7aaa7b..f9ea2c6c6 100644 --- a/cui/source/options/optchart.src +++ b/cui/source/options/optchart.src @@ -46,6 +46,7 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS }; ListBox LB_CHART_COLOR_LIST { + HelpID = "cui:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST"; Border = TRUE; Pos = MAP_APPFONT ( 12 , 15 ); Size = MAP_APPFONT ( 68 , 152 ); @@ -68,6 +69,7 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS }; PushButton PB_RESET_TO_DEFAULT { + HelpID = "cui:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT"; Pos = MAP_APPFONT ( 204 , 165 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Default"; diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index c3398ed28..3448e5095 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -60,6 +60,94 @@ using namespace ::svtools; #define GROUP_BASIC 5 #define GROUP_SQL 6 +const char* aColorLBHids[] = +{ + HID_COLORPAGE_DOCCOLOR_LB, + HID_COLORPAGE_DOCBOUNDARIES_LB, + HID_COLORPAGE_APPBACKGROUND_LB, + HID_COLORPAGE_OBJECTBOUNDARIES_LB, + HID_COLORPAGE_TABLEBOUNDARIES_LB, + HID_COLORPAGE_FONTCOLOR_LB, + HID_COLORPAGE_LINKS_LB, + HID_COLORPAGE_LINKSVISITED_LB, + HID_COLORPAGE_ANCHOR_LB, + HID_COLORPAGE_SPELL_LB, + HID_COLORPAGE_WRITERTEXTGRID_LB, + HID_COLORPAGE_WRITERFIELDSHADINGS_LB, + HID_COLORPAGE_WRITERIDXSHADINGS_LB, + HID_COLORPAGE_WRITERDIRECTCURSOR_LB, + HID_COLORPAGE_WRITERNOTESINDICATOR_LB, + HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB, + HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB, + HID_COLORPAGE_WRITERPAGEBREAKS_LB, + HID_COLORPAGE_HTMLSGML_LB, + HID_COLORPAGE_HTMLCOMMENT_LB, + HID_COLORPAGE_HTMLKEYWORD_LB, + HID_COLORPAGE_HTMLUNKNOWN_LB, + HID_COLORPAGE_CALCGRID_LB, + HID_COLORPAGE_CALCPAGEBREAK_LB, + HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB, + HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB, + HID_COLORPAGE_CALCDETECTIVE_LB, + HID_COLORPAGE_CALCDETECTIVEERROR_LB, + HID_COLORPAGE_CALCREFERENCE_LB, + HID_COLORPAGE_CALCNOTESBACKGROUND_LB, + HID_COLORPAGE_DRAWGRID_LB, + HID_COLORPAGE_DRAWDRAWING_LB, + HID_COLORPAGE_DRAWFILL_LB, + HID_COLORPAGE_BASICIDENTIFIER_LB, + HID_COLORPAGE_BASICCOMMENT_LB, + HID_COLORPAGE_BASICNUMBER_LB, + HID_COLORPAGE_BASICSTRING_LB, + HID_COLORPAGE_BASICOPERATOR_LB, + HID_COLORPAGE_BASICKEYWORD_LB, + HID_COLORPAGE_BASICERROR_LB +}; + +const char* aColorCBHids[] = +{ + HID_COLORPAGE_DOCCOLOR_CB, + HID_COLORPAGE_DOCBOUNDARIES_CB, + HID_COLORPAGE_APPBACKGROUND_CB, + HID_COLORPAGE_OBJECTBOUNDARIES_CB, + HID_COLORPAGE_TABLEBOUNDARIES_CB, + HID_COLORPAGE_FONTCOLOR_CB, + HID_COLORPAGE_LINKS_CB, + HID_COLORPAGE_LINKSVISITED_CB, + HID_COLORPAGE_ANCHOR_CB, + HID_COLORPAGE_SPELL_CB, + HID_COLORPAGE_WRITERTEXTGRID_CB, + HID_COLORPAGE_WRITERFIELDSHADINGS_CB, + HID_COLORPAGE_WRITERIDXSHADINGS_CB, + HID_COLORPAGE_WRITERDIRECTCURSOR_CB, + HID_COLORPAGE_WRITERNOTESINDICATOR_CB, + HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB, + HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB, + HID_COLORPAGE_WRITERPAGEBREAKS_CB, + HID_COLORPAGE_HTMLSGML_CB, + HID_COLORPAGE_HTMLCOMMENT_CB, + HID_COLORPAGE_HTMLKEYWORD_CB, + HID_COLORPAGE_HTMLUNKNOWN_CB, + HID_COLORPAGE_CALCGRID_CB, + HID_COLORPAGE_CALCPAGEBREAK_CB, + HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB, + HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB, + HID_COLORPAGE_CALCDETECTIVE_CB, + HID_COLORPAGE_CALCDETECTIVEERROR_CB, + HID_COLORPAGE_CALCREFERENCE_CB, + HID_COLORPAGE_CALCNOTESBACKGROUND_CB, + HID_COLORPAGE_DRAWGRID_CB, + HID_COLORPAGE_DRAWDRAWING_CB, + HID_COLORPAGE_DRAWFILL_CB, + HID_COLORPAGE_BASICIDENTIFIER_CB, + HID_COLORPAGE_BASICCOMMENT_CB, + HID_COLORPAGE_BASICNUMBER_CB, + HID_COLORPAGE_BASICSTRING_CB, + HID_COLORPAGE_BASICOPERATOR_CB, + HID_COLORPAGE_BASICKEYWORD_CB, + HID_COLORPAGE_BASICERROR_CB +}; + /* -----------------------------2002/06/26 10:48------------------------------ ---------------------------------------------------------------------------*/ @@ -815,7 +903,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe else aCheckBoxes[i]->Hide(); aCheckBoxes[i]->SetBackground(aTransparentWall); - aCheckBoxes[i]->SetHelpId(HID_COLORPAGE_CHECKBOX_START + i); + aCheckBoxes[i]->SetHelpId( aColorCBHids[i] ); if(bSetTextColor) aCheckBoxes[i]->SetTextColor(aRCheckCol); } @@ -854,13 +942,15 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe XColorEntry* pEntry = aColorTable.GetColor(i); aColorBoxes[0]->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } - aColorBoxes[0]->SetHelpId(HID_COLORPAGE_LISTBOX_START); + + aColorBoxes[0]->SetHelpId( aColorLBHids[0] ); + for( sal_Int32 i = 1; i < nCount; i++ ) { if(aColorBoxes[i]) { aColorBoxes[i]->CopyEntries( *aColorBoxes[0] ); - aColorBoxes[i]->SetHelpId(HID_COLORPAGE_LISTBOX_START + i); + aColorBoxes[i]->SetHelpId( aColorLBHids[i] ); } } } diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src index b2e9c1513..93dd25c6d 100644 --- a/cui/source/options/optcolor.src +++ b/cui/source/options/optcolor.src @@ -52,6 +52,7 @@ TabPage RID_SVXPAGE_COLORCONFIG }; ListBox LB_COLORSCHEME { + HelpID = "cui:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME"; Pos = MAP_APPFONT ( 65 , 14 ) ; Size = MAP_APPFONT ( 77 , 58 ) ; Border = TRUE; @@ -60,12 +61,14 @@ TabPage RID_SVXPAGE_COLORCONFIG }; PushButton PB_SAVESCHEME { + HelpID = "cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME"; Pos = MAP_APPFONT ( 145, 13 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Save..."; }; PushButton PB_DELETESCHEME { + HelpID = "cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_DELETESCHEME"; Pos = MAP_APPFONT ( 198 , 13 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Delete"; @@ -150,6 +153,7 @@ TabPage RID_SVXPAGE_COLORCONFIG CheckBox CB_DOCBOUND { + HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_DOCBOUND"; CB_POS_SIZE( 2 ); Text [ en-US ] = "Text boundaries"; }; @@ -164,6 +168,7 @@ TabPage RID_SVXPAGE_COLORCONFIG CheckBox CB_OBJECTBOUNDARIES { + HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_OBJECTBOUNDARIES"; CB_POS_SIZE( 4 ); Text [ en-US ] = "Object boundaries"; }; @@ -171,6 +176,7 @@ TabPage RID_SVXPAGE_COLORCONFIG CheckBox CB_TABLEBOUNDARIES { + HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_TABLEBOUNDARIES"; CB_POS_SIZE( 5 ); Text [ en-US ] = "Table boundaries"; }; @@ -185,6 +191,7 @@ TabPage RID_SVXPAGE_COLORCONFIG CheckBox CB_LINKS { + HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_LINKS"; CB_POS_SIZE( 7 ); Text [ en-US ] = "Unvisited links"; }; @@ -192,6 +199,7 @@ TabPage RID_SVXPAGE_COLORCONFIG CheckBox CB_LINKSVISITED { + HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_LINKSVISITED"; CB_POS_SIZE( 8 ); Text [ en-US ] = "Visited links"; }; @@ -226,6 +234,7 @@ TabPage RID_SVXPAGE_COLORCONFIG CheckBox CB_WRITERFIELDSHADINGS { + HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERFIELDSHADINGS"; CB_POS_SIZE( 13 ); Text [ en-US ] = "Field shadings"; }; @@ -233,6 +242,7 @@ TabPage RID_SVXPAGE_COLORCONFIG CheckBox CB_WRITERIDXSHADINGS { + HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERIDXSHADINGS"; CB_POS_SIZE( 14 ); Text [ en-US ] = "Index and table shadings"; }; @@ -248,6 +258,7 @@ TabPage RID_SVXPAGE_COLORCONFIG CheckBox CB_WRITERSECTIONBOUNDARIES { + HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERSECTIONBOUNDARIES"; CB_POS_SIZE( 16 ); Text [ en-US ] = "Section boundaries"; }; diff --git a/cui/source/options/optctl.src b/cui/source/options/optctl.src index 2da8925a5..52f265c19 100644 --- a/cui/source/options/optctl.src +++ b/cui/source/options/optctl.src @@ -47,18 +47,21 @@ TabPage RID_SVXPAGE_OPTIONS_CTL }; CheckBox CB_SEQUENCECHECKING { + HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_SEQUENCECHECKING"; Pos = MAP_APPFONT ( 12, ROW_1 ) ; Size = MAP_APPFONT ( 236 , RSC_CD_CHECKBOX_HEIGHT ) ; Text [ en-US ] = "Use se~quence checking"; }; CheckBox CB_RESTRICTED { + HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_RESTRICTED"; Pos = MAP_APPFONT ( 18, ROW_2 ); Size = MAP_APPFONT ( 236, RSC_CD_CHECKBOX_HEIGHT ); Text[ en-US ] = "Restricted"; }; CheckBox CB_TYPE_REPLACE { + HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_TYPE_REPLACE"; Pos = MAP_APPFONT ( 18, ROW_2+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y ); Size = MAP_APPFONT ( 236, RSC_CD_CHECKBOX_HEIGHT ); Text[ en-US ] = "~Type and replace"; @@ -77,12 +80,14 @@ TabPage RID_SVXPAGE_OPTIONS_CTL }; RadioButton RB_MOVEMENT_LOGICAL { + HelpID = "cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_LOGICAL"; Pos = MAP_APPFONT ( 105, ROW_4 ) ; Size = MAP_APPFONT ( 69 , RSC_CD_RADIOBUTTON_HEIGHT ) ; Text [ en-US ] = "Lo~gical"; }; RadioButton RB_MOVEMENT_VISUAL { + HelpID = "cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_VISUAL"; Pos = MAP_APPFONT ( 177, ROW_4 ) ; Size = MAP_APPFONT ( 69 , RSC_CD_RADIOBUTTON_HEIGHT ) ; Text [ en-US ] = "~Visual"; @@ -101,6 +106,7 @@ TabPage RID_SVXPAGE_OPTIONS_CTL }; ListBox LB_NUMERALS { + HelpID = "cui:ListBox:RID_SVXPAGE_OPTIONS_CTL:LB_NUMERALS"; Pos = MAP_APPFONT ( 105, ROW_7 ) ; Size = MAP_APPFONT ( 69 , 3*RSC_CD_DROPDOWN_HEIGHT ) ; DropDown = TRUE ; diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 100866b73..f18439b3d 100644..100755 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -168,6 +168,7 @@ IMPL_LINK( SvxNewDictionaryDialog, OKHdl_Impl, Button *, EMPTYARG ) String aURL( linguistic::GetWritableDictionaryURL( sDict ) ); xNewDic = Reference< XDictionary > ( xDicList->createDictionary( sDict, aLocale, eType, aURL ) , UNO_QUERY ); + xNewDic->setActive( sal_True ); } DBG_ASSERT(xNewDic.is(), "NULL pointer"); } diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src index 11d33db17..218b7afb9 100644 --- a/cui/source/options/optdict.src +++ b/cui/source/options/optdict.src @@ -51,6 +51,7 @@ ModalDialog RID_SFXDLG_NEWDICT }; Edit ED_DICTNAME { + HelpID = "cui:Edit:RID_SFXDLG_NEWDICT:ED_DICTNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 55 , 14 ) ; Size = MAP_APPFONT ( 90 , 12 ) ; @@ -65,6 +66,7 @@ ModalDialog RID_SFXDLG_NEWDICT }; ListBox LB_DICTLANG { + HelpID = "cui:ListBox:RID_SFXDLG_NEWDICT:LB_DICTLANG"; Border = TRUE ; Pos = MAP_APPFONT ( 55 , 30 ) ; Size = MAP_APPFONT ( 90 , 66 ) ; @@ -72,6 +74,7 @@ ModalDialog RID_SFXDLG_NEWDICT }; CheckBox BTN_EXCEPT { + HelpID = "cui:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT"; Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 57 , 10 ) ; Text [ en-US ] = "~Exception (-)" ; @@ -124,6 +127,7 @@ ModalDialog RID_SFXDLG_EDITDICT }; ListBox LB_ALLDICTS { + HelpID = "cui:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS"; Border = TRUE ; Pos = MAP_APPFONT ( 82 , 9 ) ; Size = MAP_APPFONT ( 121 , 62 ) ; @@ -137,6 +141,7 @@ ModalDialog RID_SFXDLG_EDITDICT }; ListBox LB_DICTLANG { + HelpID = "cui:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG"; Border = TRUE ; Pos = MAP_APPFONT ( 82 , 25 ) ; Size = MAP_APPFONT ( 121 , 66 ) ; @@ -158,6 +163,7 @@ ModalDialog RID_SFXDLG_EDITDICT }; Edit ED_WORD { + HelpID = "cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD"; Pos = MAP_APPFONT ( 12 , 56 ) ; Size = MAP_APPFONT ( 71 , 12 ) ; Border = TRUE ; @@ -172,6 +178,7 @@ ModalDialog RID_SFXDLG_EDITDICT Edit ED_REPLACE { + HelpID = "cui:Edit:RID_SFXDLG_EDITDICT:ED_REPLACE"; Pos = MAP_APPFONT ( 83 , 56 ) ; Size = MAP_APPFONT ( 120 , 12 ) ; Border = TRUE ; @@ -180,6 +187,7 @@ ModalDialog RID_SFXDLG_EDITDICT PushButton PB_NEW_REPLACE { + HelpID = "cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE"; Pos = MAP_APPFONT ( 209 , 56 ) ; Size = MAP_APPFONT ( 55 , 12 ) ; TabStop = TRUE ; @@ -187,6 +195,7 @@ ModalDialog RID_SFXDLG_EDITDICT }; PushButton PB_DELETE_REPLACE { + HelpID = "cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE"; Pos = MAP_APPFONT ( 209 , 71 ) ; Size = MAP_APPFONT ( 55 , 12 ) ; TabStop = TRUE ; diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src index e24da54e6..28b0e8214 100644 --- a/cui/source/options/optfltr.src +++ b/cui/source/options/optfltr.src @@ -32,7 +32,7 @@ // RID_OFAPAGE_MSFILTEROPT ----------------------------------------------------- TabPage RID_OFAPAGE_MSFILTEROPT { - // HelpId = ; + HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT"; OutputSize = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; SVLook = TRUE ; @@ -46,6 +46,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT }; CheckBox CB_WBAS_CODE { + HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; @@ -53,6 +54,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT }; CheckBox CB_WBAS_STG { + HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; @@ -67,6 +69,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT }; CheckBox CB_EBAS_CODE { + HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE"; Pos = MAP_APPFONT ( 12 , 55 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; @@ -74,6 +77,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT }; CheckBox CB_EBAS_EXECTBL { + HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL"; Pos = MAP_APPFONT ( 22 , 69 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; @@ -81,6 +85,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT }; CheckBox CB_EBAS_STG { + HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG"; Pos = MAP_APPFONT ( 12 , 83 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; @@ -95,6 +100,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT }; CheckBox CB_PBAS_CODE { + HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE"; Pos = MAP_APPFONT ( 12 , 110 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; @@ -102,6 +108,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT }; CheckBox CB_PBAS_STG { + HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG"; Pos = MAP_APPFONT ( 12 , 124 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; @@ -112,7 +119,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT // RID_OFAPAGE_MSFILTEROPT2 ----------------------------------------------------- TabPage RID_OFAPAGE_MSFILTEROPT2 { - // HelpId = ; + HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT2"; OutputSize = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; SVLook = TRUE ; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 41a459e3c..6ab8fe5d6 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1159,51 +1159,6 @@ void OfaViewTabPage::Reset( const SfxItemSet& ) LINK( this, OfaViewTabPage, OnAntialiasingToggled ).Call( NULL ); #endif } -/* -----------------------------23.11.00 14:55-------------------------------- - - ---------------------------------------------------------------------------*/ -class LangConfigItem_Impl : public ConfigItem -{ - Any aValue; - OUString aPropertyName; -public: - LangConfigItem_Impl(const OUString& rTree, const OUString& rProperty); - ~LangConfigItem_Impl(); - - virtual void Commit(); - - const Any& GetValue() const {return aValue;} - void SetValue(Any& rValue) {aValue = rValue; SetModified();} -}; -/* -----------------------------23.11.00 15:06-------------------------------- - - ---------------------------------------------------------------------------*/ -LangConfigItem_Impl::LangConfigItem_Impl( - const OUString& rTree, const OUString& rProperty) : - ConfigItem(rTree), - aPropertyName(rProperty) -{ - Sequence<OUString> aNames(1); - aNames.getArray()[0] = aPropertyName; - Sequence<Any> aValues = GetProperties(aNames); - aValue = aValues.getConstArray()[0]; -} -/* -----------------------------23.11.00 15:06-------------------------------- - - ---------------------------------------------------------------------------*/ -LangConfigItem_Impl::~LangConfigItem_Impl() -{} -/* -----------------------------23.11.00 15:10-------------------------------- - - ---------------------------------------------------------------------------*/ -void LangConfigItem_Impl::Commit() -{ - Sequence<OUString> aNames(1); - aNames.getArray()[0] = aPropertyName; - Sequence<Any> aValues(1); - aValues.getArray()[0] = aValue; - PutProperties(aNames, aValues); -} /* -----------------22.07.2003 10:33----------------- --------------------------------------------------*/ diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index 527f76d1f..c158c2e47 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -50,24 +50,28 @@ TabPage OFA_TP_MISC }; CheckBox CB_TOOLTIP { + HelpID = "cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP"; Pos = MAP_APPFONT( COL1, ROW1 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Tips"; }; CheckBox CB_EXTHELP { + HelpID = "cui:CheckBox:OFA_TP_MISC:CB_EXTHELP"; Pos = MAP_APPFONT( COL2, ROW2 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL2, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Extended tips"; }; CheckBox CB_HELPAGENT { + HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT"; Pos = MAP_APPFONT( COL1, ROW3 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Help Agent"; }; PushButton PB_HELPAGENT_RESET { + HelpID = "cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET"; Pos = MAP_APPFONT( COL2, ROW4 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "~Reset Help Agent"; @@ -80,6 +84,7 @@ TabPage OFA_TP_MISC }; ListBox LB_HELPFORMAT { + HelpID = "cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT"; Pos = MAP_APPFONT( COL4, ROW5 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL4, 50 ); DropDown = TRUE ; @@ -108,6 +113,7 @@ TabPage OFA_TP_MISC }; CheckBox CB_FILEDLG { + HelpID = "cui:CheckBox:OFA_TP_MISC:CB_FILEDLG"; Pos = MAP_APPFONT( COL1, ROW7 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Use %PRODUCTNAME dialogs"; @@ -120,6 +126,7 @@ TabPage OFA_TP_MISC }; CheckBox CB_DOCSTATUS { + HelpID = "cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS"; Pos = MAP_APPFONT( COL1, ROW9 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Printing sets \"document modified\" status"; @@ -138,6 +145,7 @@ TabPage OFA_TP_MISC }; NumericField NF_YEARVALUE { + HelpID = "cui:NumericField:OFA_TP_MISC:NF_YEARVALUE"; Border = TRUE ; Pos = MAP_APPFONT( COL4, ROW11 ); Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT ); @@ -160,6 +168,7 @@ TabPage OFA_TP_MISC }; CheckBox CB_PRINTDLG { + HelpID = "cui:CheckBox:OFA_TP_MISC:CB_PRINTDLG"; Pos = MAP_APPFONT( COL1, ROW9 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "Use %PRODUCTNAME ~dialogs"; @@ -192,6 +201,7 @@ TabPage OFA_TP_VIEW }; MetricField MF_WINDOWSIZE { + HelpID = "cui:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE"; Pos = MAP_APPFONT ( 95 , ROW_MF_SCALING ) ; Size = MAP_APPFONT ( 31 , 12 ) ; Border = TRUE ; @@ -220,6 +230,7 @@ TabPage OFA_TP_VIEW }; ListBox LB_ICONSIZE { + HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSIZE"; Pos = MAP_APPFONT ( 12 , ROW_LB_ICONSIZESTYLE ) ; Size = MAP_APPFONT ( 45 , 60 ) ; DropDown = TRUE ; @@ -234,6 +245,7 @@ TabPage OFA_TP_VIEW }; ListBox LB_ICONSTYLE { + HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSTYLE"; Pos = MAP_APPFONT ( 61 , ROW_LB_ICONSIZESTYLE ) ; Size = MAP_APPFONT ( 65 , 70 ) ; DropDown = TRUE ; @@ -253,6 +265,7 @@ TabPage OFA_TP_VIEW }; CheckBox CB_SYSTEM_FONT { + HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT"; TabStop = TRUE ; Pos = MAP_APPFONT( 12, ROW_CB_SYSTEM_FONT ); Size = MAP_APPFONT( 114, 16 ); @@ -262,6 +275,7 @@ TabPage OFA_TP_VIEW CheckBox CB_FONTANTIALIASING { + HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , ROW_CB_FONTANTIALIASING ) ; Size = MAP_APPFONT ( 110 , RSC_CD_CHECKBOX_HEIGHT ) ; @@ -275,6 +289,7 @@ TabPage OFA_TP_VIEW }; NumericField NF_AA_POINTLIMIT { + HelpID = "cui:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT"; Border = TRUE ; Pos = MAP_APPFONT ( 46, ROW_NF_AA_POINTLIMIT ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -304,6 +319,7 @@ TabPage OFA_TP_VIEW }; ListBox LB_MENU_ICONS { + HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MENU_ICONS"; Pos = MAP_APPFONT ( 12 , ROW_LB_MENU_ICONS ) ; Size = MAP_APPFONT ( 114 , 60 ) ; DropDown = TRUE ; @@ -324,12 +340,14 @@ TabPage OFA_TP_VIEW }; CheckBox CB_FONT_SHOW { + HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW"; Pos = MAP_APPFONT ( 12, ROW_CB_FONT_SHOW ) ; Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ; Text [ en-US ] = "Show p~review of fonts" ; }; CheckBox CB_FONT_HISTORY { + HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY"; Pos = MAP_APPFONT ( 12, ROW_CB_FONT_HISTORY ) ; Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ; Text [ en-US ] = "Show font h~istory" ; @@ -343,6 +361,7 @@ TabPage OFA_TP_VIEW CheckBox CB_USE_HARDACCELL { + HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL"; Pos = MAP_APPFONT ( 139, ROW_CB_USE_HARDACCELL ) ; Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ; Text [ en-US ] = "Use hardware acceleration" ; @@ -350,6 +369,7 @@ TabPage OFA_TP_VIEW CheckBox CB_USE_ANTIALIASE { + HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE"; Pos = MAP_APPFONT ( 139, ROW_CB_USE_ANTIALIASE ) ; Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ; Text [ en-US ] = "Use Anti-Aliasing" ; @@ -369,6 +389,7 @@ TabPage OFA_TP_VIEW }; ListBox LB_MOUSEPOS { + HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEPOS"; Pos = MAP_APPFONT ( 139, ROW_LB_MOUSEPOS ) ; Size = MAP_APPFONT ( 114 , 60 ) ; DropDown = TRUE ; @@ -389,6 +410,7 @@ TabPage OFA_TP_VIEW }; ListBox LB_MOUSEMIDDLE { + HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE"; Pos = MAP_APPFONT ( 139, ROW_LB_MOUSEMIDDLE ) ; Size = MAP_APPFONT ( 114 , 60 ) ; DropDown = TRUE ; @@ -412,6 +434,7 @@ TabPage OFA_TP_VIEW CheckBox CB_SELECTION { + HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SELECTION"; Pos = MAP_APPFONT ( 139, ROW_CB_SELECTION + (((12 - RSC_CD_CHECKBOX_HEIGHT) / 2) + 1)) ; Size = MAP_APPFONT ( 118 - 34 , RSC_CD_CHECKBOX_HEIGHT ) ; Text [ en-US ] = "Transparency" ; @@ -419,6 +442,7 @@ TabPage OFA_TP_VIEW MetricField MF_SELECTION { + HelpID = "cui:MetricField:OFA_TP_VIEW:MF_SELECTION"; Pos = MAP_APPFONT ( 139 + (95 - 12), ROW_CB_SELECTION ) ; Size = MAP_APPFONT ( 31 , 12 ) ; Border = TRUE ; @@ -463,6 +487,7 @@ TabPage OFA_TP_LANGUAGES }; ListBox LB_USERINTERFACE { + HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE"; Pos = MAP_APPFONT ( 123 , 14 ) ; Size = MAP_APPFONT ( 125 , 60 ) ; DropDown = TRUE ; @@ -484,6 +509,7 @@ TabPage OFA_TP_LANGUAGES }; ListBox LB_LOCALESETTING { + HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING"; Pos = MAP_APPFONT ( 123 , 30 ) ; Size = MAP_APPFONT ( 125 , 60 ) ; DropDown = TRUE ; @@ -499,6 +525,7 @@ TabPage OFA_TP_LANGUAGES }; CheckBox CB_DECIMALSEPARATOR { + HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR"; Pos = MAP_APPFONT ( 123 , 46) ; Size = MAP_APPFONT ( 125 , RSC_CD_CHECKBOX_HEIGHT ) ; Text [ en-US ] = "~Same as locale setting ( %1 )"; @@ -517,6 +544,7 @@ TabPage OFA_TP_LANGUAGES }; ListBox LB_CURRENCY { + HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY"; Pos = MAP_APPFONT ( 123 , 59 ) ; Size = MAP_APPFONT ( 125 , 60 ) ; DropDown = TRUE ; @@ -545,6 +573,7 @@ TabPage OFA_TP_LANGUAGES ListBox LB_WEST_LANG { + HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG"; Pos = MAP_APPFONT ( 123 , 88 ) ; Size = MAP_APPFONT ( 125 , 60 ) ; DropDown = TRUE ; @@ -566,6 +595,7 @@ TabPage OFA_TP_LANGUAGES }; ListBox LB_ASIAN_LANG { + HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG"; Pos = MAP_APPFONT ( 123 , 104 ) ; Size = MAP_APPFONT ( 125 , 60 ) ; DropDown = TRUE ; @@ -587,6 +617,7 @@ TabPage OFA_TP_LANGUAGES }; ListBox LB_COMPLEX_LANG { + HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG"; Pos = MAP_APPFONT ( 123 , 120 ) ; Size = MAP_APPFONT ( 125 , 60 ) ; DropDown = TRUE ; @@ -596,6 +627,7 @@ TabPage OFA_TP_LANGUAGES }; CheckBox CB_CURRENT_DOC { + HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC"; Pos = MAP_APPFONT ( 123 , 135 ) ; Size = MAP_APPFONT ( 125 , RSC_CD_CHECKBOX_HEIGHT ) ; Text [ en-US ] = "For the current document only"; @@ -614,6 +646,7 @@ TabPage OFA_TP_LANGUAGES }; CheckBox CB_ASIANSUPPORT { + HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT"; Pos = MAP_APPFONT ( 12 , 158 ) ; Size = MAP_APPFONT ( 236 ,RSC_CD_CHECKBOX_HEIGHT ) ; Text [ en-US ] = "E~nabled for Asian languages"; @@ -626,6 +659,7 @@ TabPage OFA_TP_LANGUAGES }; CheckBox CB_CTLSUPPORT { + HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT"; Pos = MAP_APPFONT ( 12 , 173 ) ; Size = MAP_APPFONT ( 236 , RSC_CD_CHECKBOX_HEIGHT ) ; Text [ en-US ] = "Ena~bled for complex text layout (CTL)"; diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index c7310bd3c..1c5cb9bd1 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -70,26 +70,6 @@ struct GeneralTabPage_Impl // ----------------------------------------------------------------------- -// kommt aus adritem.cxx -//CHINA001 extern String ConvertToStore_Impl( const String& ); -//copy from adritem.cxx, since it will leave in svx. -String ConvertToStore_Impl( const String& rText ) -{ - String sRet; - USHORT i = 0; - - while ( i < rText.Len() ) - { - if ( rText.GetChar(i) == '\\' || rText.GetChar(i) == '#' ) - sRet += '\\'; - sRet += rText.GetChar(i++); - } - return sRet; -} - - -// ----------------------------------------------------------------------- - SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSet ) : SfxTabPage( pParent, CUI_RES(RID_SFXPAGE_GENERAL), rCoreSet ), diff --git a/cui/source/options/optgenrl.src b/cui/source/options/optgenrl.src index fd4a0176a..aae667ff7 100644 --- a/cui/source/options/optgenrl.src +++ b/cui/source/options/optgenrl.src @@ -52,6 +52,7 @@ TabPage RID_SFXPAGE_GENERAL }; Edit ED_COMPANY { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY"; Border = TRUE ; Pos = MAP_APPFONT ( MID , LINE ( 0 ) ) ; Size = MAP_APPFONT ( RIGHT-MID , LINEH ) ; @@ -81,6 +82,7 @@ TabPage RID_SFXPAGE_GENERAL }; Edit ED_FATHERNAME { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FATHERNAME"; Border = TRUE ; Hide = TRUE; Pos = MAP_APPFONT ( MID , LINE ( 1 ) ) ; @@ -88,18 +90,21 @@ TabPage RID_SFXPAGE_GENERAL }; Edit ED_FIRSTNAME { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FIRSTNAME"; Border = TRUE ; Pos = MAP_APPFONT ( MID , LINE ( 1 ) ) ; Size = MAP_APPFONT ( NAMELEN-8 , LINEH ) ; }; Edit ED_NAME { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( MID+NAMELEN-8+HSPACE , LINE ( 1 ) ) ; Size = MAP_APPFONT ( NAMELEN-8 , LINEH ) ; }; Edit ED_SHORTNAME { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_SHORTNAME"; Border = TRUE ; Pos = MAP_APPFONT ( MID+2* ( NAMELEN-8+HSPACE ) , LINE ( 1 ) ) ; Size = MAP_APPFONT ( RIGHT- ( MID+2* ( NAMELEN-8+HSPACE ) ) , LINEH ) ; @@ -121,12 +126,14 @@ TabPage RID_SFXPAGE_GENERAL }; Edit ED_STREET { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET"; Border = TRUE ; Pos = MAP_APPFONT ( MID , LINE ( 2 ) ) ; Size = MAP_APPFONT ( RIGHT-MID , LINEH ) ; }; Edit ED_APARTMENTNR { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_APARTMENTNR"; Border = TRUE ; Hide = TRUE; Pos = MAP_APPFONT ( MID , LINE ( 2 ) ) ; @@ -141,30 +148,35 @@ TabPage RID_SFXPAGE_GENERAL }; Edit ED_PLZ { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_PLZ"; Border = TRUE ; Pos = MAP_APPFONT ( MID , LINE ( 3 ) ) ; Size = MAP_APPFONT ( 24 , LINEH ) ; }; Edit ED_CITY { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_CITY"; Border = TRUE ; Pos = MAP_APPFONT ( MID + 24 + HSPACE , LINE ( 3 ) ) ; Size = MAP_APPFONT ( RIGHT - ( MID + 24 + HSPACE ) , LINEH ) ; }; Edit ED_US_CITY { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_US_CITY"; Border = TRUE ; Pos = MAP_APPFONT ( MID , LINE ( 3 ) ) ; Size = MAP_APPFONT ( 90 , LINEH ) ; }; Edit ED_US_STATE { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_US_STATE"; Border = TRUE ; Pos = MAP_APPFONT ( MID + 90 + HSPACE, LINE ( 3 ) ) ; Size = MAP_APPFONT ( 30 , LINEH ) ; }; Edit ED_US_ZIPCODE { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_US_ZIPCODE"; Border = TRUE ; Pos = MAP_APPFONT ( MID + 90 + HSPACE + 30 + HSPACE, LINE ( 3 ) ) ; Size = MAP_APPFONT ( RIGHT - ( MID + 90 + HSPACE + 30 + HSPACE ) , LINEH ) ; @@ -178,6 +190,7 @@ TabPage RID_SFXPAGE_GENERAL }; Edit ED_COUNTRY { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_COUNTRY"; Border = TRUE ; Pos = MAP_APPFONT ( MID , LINE ( 4 ) ) ; Size = MAP_APPFONT ( RIGHT - MID , LINEH ) ; @@ -191,12 +204,14 @@ TabPage RID_SFXPAGE_GENERAL }; Edit ED_TITLE { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TITLE"; Border = TRUE ; Pos = MAP_APPFONT ( MID , LINE ( 5 ) ) ; Size = MAP_APPFONT ( NAMELEN-1 , LINEH ) ; }; Edit ED_POSITION { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_POSITION"; Border = TRUE ; Pos = MAP_APPFONT ( MID+NAMELEN-1+HSPACE , LINE ( 5 ) ) ; Size = MAP_APPFONT ( RIGHT- ( MID+NAMELEN-1+HSPACE ) , LINEH ) ; @@ -210,12 +225,14 @@ TabPage RID_SFXPAGE_GENERAL }; Edit ED_TELPRIVAT { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TELPRIVAT"; Border = TRUE ; Pos = MAP_APPFONT ( MID , LINE ( 6 ) ) ; Size = MAP_APPFONT ( NAMELEN-1 , LINEH ) ; }; Edit ED_TELCOMPANY { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TELCOMPANY"; Border = TRUE ; Pos = MAP_APPFONT ( MID+NAMELEN-1+HSPACE , LINE ( 6 ) ) ; Size = MAP_APPFONT ( RIGHT- ( MID+NAMELEN-1+HSPACE ) , LINEH ) ; @@ -229,12 +246,14 @@ TabPage RID_SFXPAGE_GENERAL }; Edit ED_FAX { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FAX"; Border = TRUE ; Pos = MAP_APPFONT ( MID , LINE ( 7 ) ) ; Size = MAP_APPFONT ( NAMELEN-1 , LINEH ) ; }; Edit ED_EMAIL { + HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_EMAIL"; Border = TRUE ; Pos = MAP_APPFONT ( MID+NAMELEN-1+HSPACE , LINE ( 7 ) ) ; Size = MAP_APPFONT ( RIGHT- ( MID+NAMELEN-1+HSPACE ) , LINEH ) ; @@ -247,6 +266,7 @@ TabPage RID_SFXPAGE_GENERAL }; CheckBox CB_USEDATA { + HelpID = "cui:CheckBox:RID_SFXPAGE_GENERAL:CB_USEDATA"; Pos = MAP_APPFONT ( 6 , 122 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Hide = TRUE; diff --git a/cui/source/options/opthtml.src b/cui/source/options/opthtml.src index 715be82d2..06fd5d6c9 100644 --- a/cui/source/options/opthtml.src +++ b/cui/source/options/opthtml.src @@ -32,7 +32,7 @@ // RID_OFAPAGE_HTMLOPT ----------------------------------------------------- TabPage RID_OFAPAGE_HTMLOPT { - // HelpId = ; + HelpID = "cui:TabPage:RID_OFAPAGE_HTMLOPT"; OutputSize = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; SVLook = TRUE ; @@ -45,6 +45,7 @@ TabPage RID_OFAPAGE_HTMLOPT }; NumericField NF_SIZE1 { + HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE1"; Pos = MAP_APPFONT ( 45 , 14 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Border = TRUE ; @@ -67,6 +68,7 @@ TabPage RID_OFAPAGE_HTMLOPT }; NumericField NF_SIZE2 { + HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE2"; Pos = MAP_APPFONT ( 45 , 30 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Border = TRUE ; @@ -89,6 +91,7 @@ TabPage RID_OFAPAGE_HTMLOPT }; NumericField NF_SIZE3 { + HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE3"; Pos = MAP_APPFONT ( 45 , 46 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Border = TRUE ; @@ -111,6 +114,7 @@ TabPage RID_OFAPAGE_HTMLOPT }; NumericField NF_SIZE4 { + HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE4"; Pos = MAP_APPFONT ( 45 , 62 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Border = TRUE ; @@ -133,6 +137,7 @@ TabPage RID_OFAPAGE_HTMLOPT }; NumericField NF_SIZE5 { + HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE5"; Pos = MAP_APPFONT ( 45 , 78 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Border = TRUE ; @@ -155,6 +160,7 @@ TabPage RID_OFAPAGE_HTMLOPT }; NumericField NF_SIZE6 { + HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE6"; Pos = MAP_APPFONT ( 45 , 94 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Border = TRUE ; @@ -177,6 +183,7 @@ TabPage RID_OFAPAGE_HTMLOPT }; NumericField NF_SIZE7 { + HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE7"; Pos = MAP_APPFONT ( 45 , 110 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Border = TRUE ; @@ -205,6 +212,7 @@ TabPage RID_OFAPAGE_HTMLOPT }; CheckBox CB_NUMBERS_ENGLISH_US { + HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US"; Pos = MAP_APPFONT ( 93 , 14 ) ; Size = MAP_APPFONT ( 161 , 10 ) ; TabStop = TRUE ; @@ -212,6 +220,7 @@ TabPage RID_OFAPAGE_HTMLOPT }; CheckBox CB_UNKNOWN_TAGS { + HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS"; Pos = MAP_APPFONT ( 93 , 28 ) ; Size = MAP_APPFONT ( 155 , 10 ) ; TabStop = TRUE ; @@ -219,6 +228,7 @@ TabPage RID_OFAPAGE_HTMLOPT }; CheckBox CB_IGNORE_FONTNAMES { + HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES"; Pos = MAP_APPFONT ( 93 , 42 ) ; Size = MAP_APPFONT ( 155 , 10 ) ; TabStop = TRUE ; @@ -232,6 +242,7 @@ TabPage RID_OFAPAGE_HTMLOPT }; ListBox LB_EXPORT { + HelpID = "cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_EXPORT"; Pos = MAP_APPFONT ( 93 , 69 ) ; Size = MAP_APPFONT ( 155 , 50 ) ; Border = TRUE ; @@ -246,24 +257,28 @@ TabPage RID_OFAPAGE_HTMLOPT }; CheckBox CB_STARBASIC { + HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC"; Pos = MAP_APPFONT ( 93 , 88 ) ; Size = MAP_APPFONT ( 155 , 10 ) ; Text = "%PRODUCTNAME ~Basic" ; }; CheckBox CB_STARBASIC_WARNING { + HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING"; Pos = MAP_APPFONT ( 99 , 102 ) ; Size = MAP_APPFONT ( 149 , 10 ) ; Text [ en-US ] = "Display ~warning"; }; CheckBox CB_PRINT_EXTENSION { + HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION"; Pos = MAP_APPFONT ( 93 , 116 ) ; Size = MAP_APPFONT ( 155 , 10 ) ; Text [ en-US ] = "~Print layout" ; }; CheckBox CB_LOCAL_GRF { + HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF"; Pos = MAP_APPFONT ( 93 , 130 ) ; Size = MAP_APPFONT ( 155 , 10 ) ; Text [ en-US ] = "~Copy local graphics to Internet" ; @@ -277,6 +292,7 @@ TabPage RID_OFAPAGE_HTMLOPT }; ListBox LB_CHARSET { + HelpID = "cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_CHARSET"; Pos = MAP_APPFONT ( 162 , 143 ) ; Size = MAP_APPFONT ( 86 , 61 ) ; TabStop = TRUE ; diff --git a/cui/source/options/optimprove.cxx b/cui/source/options/optimprove.cxx index f71f9b450..4dd20b8b5 100644 --- a/cui/source/options/optimprove.cxx +++ b/cui/source/options/optimprove.cxx @@ -197,31 +197,3 @@ IMPL_LINK( SvxImprovementDialog, HandleOK, OKButton*, EMPTYARG ) EndDialog( RET_OK ); return 0; } - -// class SvxInfoWindow --------------------------------------------------- - -SvxInfoWindow::SvxInfoWindow( Window* pParent, const ResId& rResId ) : - Window( pParent, rResId ), - m_aInfoText( this ) -{ - m_aInfoText.SetPosSizePixel( Point( 10, 10 ), Size( 150, 10 ) ); - - const StyleSettings& rSettings = GetSettings().GetStyleSettings(); - Wallpaper aWall( rSettings.GetWindowColor() ); - SetBackground( aWall ); - Font aNewFont( m_aInfoText.GetFont() ); - aNewFont.SetTransparent( TRUE ); - m_aInfoText.SetFont( aNewFont ); - m_aInfoText.SetBackground( aWall ); - m_aInfoText.SetControlForeground( rSettings.GetWindowTextColor() ); -} - -void SvxInfoWindow::SetInfoText( const String& rText ) -{ - m_aInfoText.SetText( rText ); - Size aSize = m_aInfoText.CalcMinimumSize(); - Size aWinSize = GetSizePixel(); - Point aPos( ( aWinSize.Width() - aSize.Width() ) / 2, ( aWinSize.Height() - aSize.Height() ) / 2 ); - m_aInfoText.SetPosSizePixel( aPos, aSize ); -} - diff --git a/cui/source/options/optimprove.src b/cui/source/options/optimprove.src index 42c800905..15d7a643f 100644 --- a/cui/source/options/optimprove.src +++ b/cui/source/options/optimprove.src @@ -34,7 +34,7 @@ TabPage RID_SVXPAGE_IMPROVEMENT { - //!HelpId = HID_OPTIONS_IMPROVEMENT ; + HelpId = "cui:TabPage:RID_SVXPAGE_IMPROVEMENT" ; OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; @@ -55,6 +55,7 @@ TabPage RID_SVXPAGE_IMPROVEMENT }; RadioButton RB_YES { + HelpID = "cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES"; Pos = MAP_APPFONT ( 12 , 92 ) ; Size = MAP_APPFONT ( 215 , 10 ) ; Check = TRUE ; @@ -62,6 +63,7 @@ TabPage RID_SVXPAGE_IMPROVEMENT }; RadioButton RB_NO { + HelpID = "cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO"; Pos = MAP_APPFONT ( 12 , 105 ) ; Size = MAP_APPFONT ( 215 , 10 ) ; Text [ en-US ] = "~No, I do not wish to participate" ; @@ -84,29 +86,30 @@ TabPage RID_SVXPAGE_IMPROVEMENT FixedText FT_NR_REPORTS { Pos = MAP_APPFONT ( 12 , 132 ) ; - Size = MAP_APPFONT ( 80 , 8 ) ; + Size = MAP_APPFONT ( 96 , 8 ) ; Text [ en-US ] = "Number of reports sent:" ; }; FixedText FT_NR_REPORTS_VALUE { - Pos = MAP_APPFONT ( 95 , 132 ) ; + Pos = MAP_APPFONT ( 111 , 132 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; }; FixedText FT_NR_ACTIONS { Pos = MAP_APPFONT ( 12 , 145 ) ; - Size = MAP_APPFONT ( 80 , 8 ) ; + Size = MAP_APPFONT ( 96 , 8 ) ; Text [ en-US ] = "Number of tracked actions:" ; }; FixedText FT_NR_ACTIONS_VALUE { - Pos = MAP_APPFONT ( 95 , 145 ) ; + Pos = MAP_APPFONT ( 111 , 145 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; }; PushButton PB_SHOWDATA { + HelpID = "cui:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA"; Pos = MAP_APPFONT ( 12 , 161 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Show Data" ; }; String STR_INFO diff --git a/cui/source/options/optimprove2.cxx b/cui/source/options/optimprove2.cxx index a0e246ce6..9a49fa2e6 100644 --- a/cui/source/options/optimprove2.cxx +++ b/cui/source/options/optimprove2.cxx @@ -52,6 +52,7 @@ #include <comphelper/synchronousdispatch.hxx> #include <comphelper/uieventslogger.hxx> #include <tools/testtoolloader.hxx> +#include <osl/file.hxx> #define C2S(s) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s)) @@ -61,14 +62,16 @@ namespace uno = ::com::sun::star::uno; namespace util = ::com::sun::star::util; using namespace com::sun::star::system; -// class SvxEmptyPage ---------------------------------------------------- - -SvxEmptyPage::SvxEmptyPage( Window* pParent ) : - - TabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ) ) +namespace { - FreeResource(); + bool lcl_doesLogfileExist(const ::rtl::OUString& sLogPath) + { + ::rtl::OUString sLogFile( sLogPath ); + sLogFile += C2S("/Current.csv"); + ::osl::File aLogFile(sLogFile); + return aLogFile.open(osl_File_OpenFlag_Read) == ::osl::FileBase::E_None; + } } // class SvxImprovementOptionsPage --------------------------------------- @@ -153,7 +156,10 @@ IMPL_LINK( SvxImprovementOptionsPage, HandleShowData, PushButton*, EMPTYARG ) uno::Reference< lang::XComponent > xDoc = ::comphelper::SynchronousDispatch::dispatch( xDesktop, sLogFile, C2S("_default"), 0, aArgs ); if ( xDoc.is() ) + { + dynamic_cast<Dialog*>(GetParent())->EndDialog( RET_CANCEL ); return 1; + } } return 0; @@ -164,11 +170,6 @@ SfxTabPage* SvxImprovementOptionsPage::Create( Window* pParent, const SfxItemSet return new SvxImprovementOptionsPage( pParent, rSet ); } -sal_uInt16* SvxImprovementOptionsPage::GetRanges() -{ - return NULL; -} - sal_Bool SvxImprovementOptionsPage::FillItemSet( SfxItemSet& /*rSet*/ ) { uno::Reference< lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory(); @@ -259,11 +260,13 @@ void SvxImprovementOptionsPage::Reset( const SfxItemSet& /*rSet*/ ) if ( xSubst.is() ) sPath = xSubst->substituteVariables( sPath, sal_False ); m_sLogPath = sPath; + m_aShowDataPB.Enable(lcl_doesLogfileExist(m_sLogPath)); } } } catch( uno::Exception& ) { + m_aShowDataPB.Enable(false); } } diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 6144bb40a..1c81914e9 100755..100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -136,47 +136,6 @@ const char* SEARCHENGINE_GROUP = "SearchEngines-$(vlang)"; // ----------------------------------------------------------------------- -String lcl_MakeTabEntry(const SfxFilter* pFilter) -{ - String sEntry(pFilter->GetMimeType()); - sEntry += '\t'; - sEntry += pFilter->GetWildcard().GetWildCard(); - sEntry += '\t'; - sEntry += pFilter->GetName(); -#if defined(OS2) - sEntry += '\t'; - sEntry += pFilter->GetTypeName(); -#endif - return sEntry; -} - -// ----------------------------------------------------------------------- - -BOOL IsJavaInstalled_Impl( /*!!!SfxIniManager* pIniMgr*/ ) -{ - BOOL bRet = FALSE; -/*!!! (pb) needs new implementation - String aIniEntry; - String aFullName = Config::GetConfigName( pIniMgr->Get( SFX_KEY_USERCONFIG_PATH ), - String::CreateFromAscii("java") ); - INetURLObject aIniFileObj( aFullName, INET_PROT_FILE ); - String aIniPath = aIniFileObj.getName(); - if ( pIniMgr->SearchFile( aIniPath ) ) - { - Config aJavaCfg( aIniPath ); - aJavaCfg.SetGroup( "Java" ); - ByteString sTemp = aJavaCfg.ReadKey( ByteString(::rtl::OUStringToOString(pIniMgr->GetKeyName( SFX_KEY_JAVA_SYSTEMCLASSPATH ),RTL_TEXTENCODING_UTF8)) ); - String aJavaSystemClassPath = ::rtl::OStringToOUString(sTemp,RTL_TEXTENCODING_UTF8); - String aJavaRuntimeLib = ::rtl::OStringToOUString(aJavaCfg.ReadKey( "RuntimeLib" ),RTL_TEXTENCODING_UTF8); - if ( aJavaSystemClassPath.Len() && aJavaRuntimeLib.Len() ) - bRet = TRUE; - } -*/ - return bRet; -} - -// ----------------------------------------------------------------------- - void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent ) { if ( bOnlyNumeric ) @@ -1130,146 +1089,6 @@ IMPL_LINK( SvxSearchTabPage, SearchPartHdl_Impl, RadioButton *, EMPTYARG ) return 0; } -// ----------------------------------------------------------------------- - -/********************************************************************/ -/********************************************************************/ -/* */ -/* SvxOtherTabPage */ -/* */ -/********************************************************************/ -/********************************************************************/ - -/*-----------------15.05.97 09:51------------------- - ---------------------------------------------------*/ -/* -SvxPatternField::SvxPatternField( Window* pParent, const ResId& rResId ) : - - PatternField( pParent, rResId ), - - sMsg233 ( ResId( ST_MSG_233 ) ), - sMsg255 ( ResId( ST_MSG_255 ) ) - -{ - FreeResource(); - SelectFixedFont(); -} */ - -/*-----------------15.05.97 09:51------------------- - ---------------------------------------------------*/ - -/*void SvxPatternField::KeyInput( const KeyEvent& rKEvt ) -{ - PatternField::KeyInput( rKEvt ); - BOOL bDelete = ( rKEvt.GetKeyCode().GetCode() == KEY_DELETE ); - String sEntry( GetText() ); - sEntry[(USHORT)3] = '.'; - sEntry[(USHORT)7] = '.'; - sEntry[(USHORT)11] = '.'; - Selection aSelection( GetSelection() ); - String sPart( sEntry.GetToken( 0, '.' ) ); - USHORT i, nPart( sPart.EraseLeadingChars() ); - BOOL bSet = FALSE; - - if ( sPart.Len() && ( !nPart || nPart > 255 ) ) - { - // der erste Part darf nicht 0 und nicht gr"osser 255 sein - String sMsg( sPart ); - sMsg += ' '; - sMsg += sMsg233; - InfoBox( this, sMsg ).Execute(); - - if ( nPart == 0 ) - sPart = " 1"; - else - sPart = "255"; - sEntry.SetToken( 0, '.', sPart ); - bSet = TRUE; - }; - - for ( i = 1; i < 4; i++ ) - { - // die anderen Parts d"urfen nicht gr"osser 255 sein - sPart = sEntry.GetToken( i, '.' ); - nPart = sPart.EraseLeadingChars(); - - if ( nPart > 255 ) - { - String sMsg( sPart ); - sMsg += ' '; - sMsg += sMsg255; - InfoBox( this, sMsg ).Execute(); - - if ( nPart == 0 ) - sPart = " 1"; - else - sPart = "255"; - sEntry.SetToken( i, '.', sPart ); - bSet = TRUE; - }; - } - - if ( bSet ) - { - SetText( sEntry ); - SetSelection( aSelection ); - } -} -*/ -// ----------------------------------------------------------------------- -#if 0 -long SvxPatternField::Notify( NotifyEvent& rNEvt ) -{ - return PatternField::Notify( rNEvt ); -/*! long nHandled = 0; - - if ( rNEvt.GetType() == EVENT_KEYUP ) - { - const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - KeyInput( *pKEvt ); - nHandled = 1; - } - return nHandled;*/ -} -#endif - -// class JavaScriptDisableQueryBox_Impl -------------------------------------- - -class JavaScriptDisableQueryBox_Impl : public ModalDialog -{ -private: - FixedImage aImage; - FixedText aWarningFT; - CheckBox aDisableCB; - OKButton aYesBtn; - CancelButton aNoBtn; - -public: - JavaScriptDisableQueryBox_Impl( Window* pParent ); - - BOOL IsWarningDisabled() const { return aDisableCB.IsChecked(); } -}; - -JavaScriptDisableQueryBox_Impl::JavaScriptDisableQueryBox_Impl( Window* pParent ) : - - ModalDialog( pParent, CUI_RES( RID_SVXDLG_OPT_JAVASCRIPT_DISABLE ) ), - - aImage ( this, CUI_RES( IMG_JSCPT_WARNING ) ), - aWarningFT ( this, CUI_RES( FT_JSCPT_WARNING ) ), - aDisableCB ( this, CUI_RES( CB_JSCPT_DISABLE ) ), - aYesBtn ( this, CUI_RES( BTN_JSCPT_YES ) ), - aNoBtn ( this, CUI_RES( BTN_JSCPT_NO ) ) - -{ - FreeResource(); - - aYesBtn.SetText( Button::GetStandardText( BUTTON_YES ) ); - aNoBtn.SetText( Button::GetStandardText( BUTTON_NO ) ); - aImage.SetImage( WarningBox::GetStandardImage() ); -} - //#98647#---------------------------------------------- void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt ) { // try to show tips just like as on toolbars @@ -1645,25 +1464,6 @@ int SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet ) namespace { -/* bool Enable( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, Control& _rCtrl, FixedImage& _rImg ) - { - bool b = _rOpt.IsOptionEnabled( _eOpt ); - _rCtrl.Enable( b ); - _Img.Show( !b ); - return b; - } -*/ - bool EnableAndSet( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, - CheckBox& _rCtrl, FixedImage& _rImg ) - { -// bool b = Enable( _rOpt, _eOpt, _rCtrl, _rImg ); - bool b = _rOpt.IsOptionEnabled( _eOpt ); - _rCtrl.Enable( b ); - _rImg.Show( !b ); - _rCtrl.Check( _rOpt.IsOptionSet( _eOpt ) ); - return b; - } - bool CheckAndSave( SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, const bool _bIsChecked, bool& _rModfied ) { bool bModified = false; diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src index 848cdc278..15b40051c 100755..100644 --- a/cui/source/options/optinet2.src +++ b/cui/source/options/optinet2.src @@ -41,6 +41,7 @@ TabPage RID_SVXPAGE_INET_MOZPLUGIN { + HelpID = "cui:TabPage:RID_SVXPAGE_INET_MOZPLUGIN"; OutputSize = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; SVLook = TRUE ; @@ -54,6 +55,7 @@ TabPage RID_SVXPAGE_INET_MOZPLUGIN }; CheckBox CB_MOZPLUGIN_CODE { + HelpID = "cui:CheckBox:RID_SVXPAGE_INET_MOZPLUGIN:CB_MOZPLUGIN_CODE"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; @@ -87,6 +89,7 @@ TabPage RID_SVXPAGE_INET_PROXY }; ListBox LB_PROXYMODE { + HelpID = "cui:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE"; Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 11 ) ; Size = MAP_APPFONT ( 49 , 48 ) ; Border = TRUE ; @@ -110,6 +113,7 @@ TabPage RID_SVXPAGE_INET_PROXY }; Edit ED_HTTP_PROXY { + HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY"; Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 27 ) ; Size = MAP_APPFONT ( 123 , 12 ) ; Border = TRUE ; @@ -128,6 +132,7 @@ TabPage RID_SVXPAGE_INET_PROXY }; Edit ED_HTTP_PORT { + HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT"; Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 27 ) ; Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ; Border = TRUE ; @@ -141,6 +146,7 @@ TabPage RID_SVXPAGE_INET_PROXY }; Edit ED_HTTPS_PROXY { + HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PROXY"; Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 43 ) ; Size = MAP_APPFONT ( 123 , 12 ) ; Border = TRUE ; @@ -154,6 +160,7 @@ TabPage RID_SVXPAGE_INET_PROXY }; Edit ED_HTTPS_PORT { + HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PORT"; Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 43 ) ; Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ; Border = TRUE ; @@ -167,6 +174,7 @@ TabPage RID_SVXPAGE_INET_PROXY }; Edit ED_FTP_PROXY { + HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PROXY"; Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 59 ) ; Size = MAP_APPFONT ( 123 , 12 ) ; Border = TRUE ; @@ -180,6 +188,7 @@ TabPage RID_SVXPAGE_INET_PROXY }; Edit ED_FTP_PORT { + HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT"; Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 59 ) ; Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ; Border = TRUE ; @@ -192,6 +201,7 @@ TabPage RID_SVXPAGE_INET_PROXY }; Edit ED_SOCKS_PROXY { + HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PROXY"; Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 75 ) ; Size = MAP_APPFONT ( 123 , 12 ) ; Border = TRUE ; @@ -205,6 +215,7 @@ TabPage RID_SVXPAGE_INET_PROXY }; Edit ED_SOCKS_PORT { + HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PORT"; Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 75 ) ; Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ; Border = TRUE ; @@ -217,6 +228,7 @@ TabPage RID_SVXPAGE_INET_PROXY }; Edit ED_NOPROXYFOR { + HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR"; Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 91 ) ; Size = MAP_APPFONT ( 123 , 12 ) ; Border = TRUE ; @@ -235,18 +247,21 @@ TabPage RID_SVXPAGE_INET_PROXY }; RadioButton RB_DNS_AUTO { + HelpID = "cui:RadioButton:RID_SVXPAGE_INET_PROXY:RB_DNS_AUTO"; Pos = MAP_APPFONT( 12, 111 ); Size = MAP_APPFONT( 236, 10 ); Text [ en-US ] = "~Automatic" ; }; RadioButton RB_DNS_MANUAL { + HelpID = "cui:RadioButton:RID_SVXPAGE_INET_PROXY:RB_DNS_MANUAL"; Pos = MAP_APPFONT( 12, 124 ); Size = MAP_APPFONT( 75, 10 ); Text [ en-US ] = "~Manual" ; }; PatternField ED_DNS { + HelpID = "cui:PatternField:RID_SVXPAGE_INET_PROXY:ED_DNS"; Pos = MAP_APPFONT( 90, 126 ); Size = MAP_APPFONT( 66, 12 ); Border = TRUE ; @@ -287,6 +302,7 @@ TabPage RID_SVXPAGE_INET_SEARCH }; ListBox LB_SEARCH { + HelpID = "cui:ListBox:RID_SVXPAGE_INET_SEARCH:LB_SEARCH"; Pos = MAP_APPFONT ( 12 , GB_SEARCH_TOP + 11 ) ; Size = MAP_APPFONT ( 39 , 120 ) ; Border = TRUE ; @@ -303,6 +319,7 @@ TabPage RID_SVXPAGE_INET_SEARCH }; Edit ED_SEARCH_NAME { + HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME"; Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 11 ) ; Size = MAP_APPFONT ( 125 , 12 ) ; Border = TRUE ; @@ -315,6 +332,7 @@ TabPage RID_SVXPAGE_INET_SEARCH }; RadioButton RB_AND { + HelpID = "cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_AND"; Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 26 ) ; Size = MAP_APPFONT ( 125 , 10 ) ; Check = TRUE ; @@ -322,12 +340,14 @@ TabPage RID_SVXPAGE_INET_SEARCH }; RadioButton RB_OR { + HelpID = "cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_OR"; Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 39 ) ; Size = MAP_APPFONT ( 125 , 10 ) ; Text [ en-US ] = "~Or" ; }; RadioButton RB_EXACT { + HelpID = "cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_EXACT"; Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 52 ) ; Size = MAP_APPFONT ( 125 , 10 ) ; Text [ en-US ] = "E~xact" ; @@ -340,6 +360,7 @@ TabPage RID_SVXPAGE_INET_SEARCH }; Edit ED_URL { + HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_URL"; Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 65 ) ; Size = MAP_APPFONT ( 125 , 12 ) ; Border = TRUE ; @@ -352,6 +373,7 @@ TabPage RID_SVXPAGE_INET_SEARCH }; Edit ED_POSTFIX { + HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX"; Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 80 ) ; Size = MAP_APPFONT ( 125 , 12 ) ; Border = TRUE ; @@ -364,6 +386,7 @@ TabPage RID_SVXPAGE_INET_SEARCH }; Edit ED_SEPARATOR { + HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR"; Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 95 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; Border = TRUE ; @@ -376,6 +399,7 @@ TabPage RID_SVXPAGE_INET_SEARCH }; ListBox ED_CASE { + HelpID = "cui:ListBox:RID_SVXPAGE_INET_SEARCH:ED_CASE"; Pos = MAP_APPFONT ( EDIT_START_XPOS, GB_SEARCH_TOP + 110 ) ; Size = MAP_APPFONT ( 42 , 48 ) ; Border = TRUE ; @@ -389,24 +413,28 @@ TabPage RID_SVXPAGE_INET_SEARCH }; PushButton PB_NEW { + HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW"; Pos = MAP_APPFONT ( 39 , GB_SEARCH_TOP + 131 + 6 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "N~ew"; }; PushButton PB_ADD { + HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD"; Pos = MAP_APPFONT ( 92 , GB_SEARCH_TOP + 131 + 6 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Add" ; }; PushButton PB_CHANGE { + HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE"; Pos = MAP_APPFONT ( 145 , GB_SEARCH_TOP + 131 + 6 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Modify" ; }; PushButton PB_DELETE { + HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE"; Pos = MAP_APPFONT ( 198 , GB_SEARCH_TOP + 131 + 6 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete" ; @@ -426,6 +454,7 @@ TabPage RID_SVXPAGE_INET_SEARCH TabPage RID_SVXPAGE_INET_SECURITY { + HelpID = "cui:TabPage:RID_SVXPAGE_INET_SECURITY"; OutputSize = TRUE ; Size = MAP_APPFONT( TP_WIDTH , TP_HEIGHT ); SVLook = TRUE; @@ -446,6 +475,7 @@ TabPage RID_SVXPAGE_INET_SECURITY }; PushButton PB_SEC_SECURITYOPTIONS { + HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_SECURITYOPTIONS"; Pos = MAP_APPFONT( COL_3, ROW_2a ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "Options..."; @@ -458,6 +488,7 @@ TabPage RID_SVXPAGE_INET_SECURITY }; CheckBox CB_SEC_SAVEPASSWORDS { + HelpID = "cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_SAVEPASSWORDS"; Pos = MAP_APPFONT( COL_1, ROW_3 - 4 ); Size = MAP_APPFONT( COL_2-COL_1, 16 ); Wordbreak = TRUE; @@ -465,12 +496,14 @@ TabPage RID_SVXPAGE_INET_SECURITY }; PushButton PB_SEC_CONNECTIONS { + HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_CONNECTIONS"; Pos = MAP_APPFONT( COL_3, ROW_3-1 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "Connections..."; }; CheckBox CB_SEC_MASTERPASSWORD { + HelpID = "cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_MASTERPASSWORD"; Pos = MAP_APPFONT( COL_1a, ROW_4 ); Size = MAP_APPFONT( COL_2-COL_1a, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "Protected by a master password (recommended)"; @@ -484,6 +517,7 @@ TabPage RID_SVXPAGE_INET_SECURITY }; PushButton PB_SEC_MASTERPASSWORD { + HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MASTERPASSWORD"; Pos = MAP_APPFONT( COL_3, ROW_4a ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "Master Password..."; @@ -503,6 +537,7 @@ TabPage RID_SVXPAGE_INET_SECURITY }; PushButton PB_SEC_MACROSEC { + HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC"; Pos = MAP_APPFONT( COL_3, ROW_6-2 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "Macro Security..."; @@ -523,6 +558,7 @@ ErrorBox RID_SVXERR_OPT_PROXYPORTS ModalDialog RID_SVXDLG_OPT_JAVASCRIPT_DISABLE { + HelpID = "cui:ModalDialog:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE"; OutputSize = TRUE; Size = MAP_APPFONT( 150, 81 ); Moveable = TRUE; @@ -541,6 +577,7 @@ ModalDialog RID_SVXDLG_OPT_JAVASCRIPT_DISABLE }; CheckBox CB_JSCPT_DISABLE { + HelpID = "cui:CheckBox:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE:CB_JSCPT_DISABLE"; Pos = MAP_APPFONT( 39, 45 ); Size = MAP_APPFONT( 195, 12 ); Hide = TRUE; @@ -591,6 +628,7 @@ TabPage RID_SVXPAGE_INET_MAIL Edit ED_MAILERURL { + HelpID = "cui:Edit:RID_SVXPAGE_INET_MAIL:ED_MAILERURL"; Pos = MAP_APPFONT ( 60 , 18 ) ; Size = MAP_APPFONT ( 171 , 12 ) ; Border = TRUE; @@ -598,6 +636,7 @@ TabPage RID_SVXPAGE_INET_MAIL PushButton PB_MAILERURL { + HelpID = "cui:PushButton:RID_SVXPAGE_INET_MAIL:PB_MAILERURL"; Pos = MAP_APPFONT ( 234 , 17 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "..." ; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 1e784fec2..702ad5ac7 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -65,56 +65,6 @@ using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::uno; -// class SvxJavaTable ---------------------------------------------------- - -SvxJavaTable::SvxJavaTable( Window* _pParent, const ResId& _rId ) : - - SvxSimpleTable( _pParent, _rId ) - -{ -} - -SvxJavaTable::~SvxJavaTable() -{ -} - -void SvxJavaTable::SetTabs() -{ - SvxSimpleTable::SetTabs(); -/* - USHORT nAdjust = SV_LBOXTAB_ADJUST_RIGHT | SV_LBOXTAB_ADJUST_LEFT | - SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_ADJUST_NUMERIC | SV_LBOXTAB_FORCE; - if ( aTabs.Count() > 0 ) - { - SvLBoxTab* pTab = (SvLBoxTab*)aTabs.GetObject(0); - pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SV_LBOXTAB_PUSHABLE | SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_FORCE; - } -*/ -} - -void SvxJavaTable::MouseButtonUp( const MouseEvent& _rMEvt ) -{ - m_aCurMousePoint = _rMEvt.GetPosPixel(); - SvxSimpleTable::MouseButtonUp( _rMEvt ); -} - -void SvxJavaTable::KeyInput( const KeyEvent& rKEvt ) -{ - if ( !rKEvt.GetKeyCode().GetModifier() && KEY_SPACE == rKEvt.GetKeyCode().GetCode() ) - { - SvLBoxEntry* pEntry = FirstSelected(); - if ( GetCheckButtonState( pEntry ) == SV_BUTTON_UNCHECKED ) - { - SetCheckButtonState( pEntry, SV_BUTTON_CHECKED ); - GetCheckButtonHdl().Call( NULL ); - return ; - } - } - - SvxSimpleTable::KeyInput( rKEvt ); -} - // ----------------------------------------------------------------------- bool areListsEqual( const Sequence< ::rtl::OUString >& rListA, const Sequence< ::rtl::OUString >& rListB ) diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 1914b7ebc..d74b21b41 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -47,27 +47,6 @@ typedef struct _JavaInfo JavaInfo; class SvxJavaParameterDlg; class SvxJavaClassPathDlg; -// class SvxJavaTable ---------------------------------------------------- - -class SvxJavaTable : public SvxSimpleTable -{ - using SvxSimpleTable::SetTabs; -private: - Point m_aCurMousePoint; - -protected: - virtual void SetTabs(); - virtual void MouseButtonUp( const MouseEvent& _rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - -public: - SvxJavaTable( Window* _pParent, const ResId& _rId ); - ~SvxJavaTable(); - - - inline Point GetCurMousePoint() { return m_aCurMousePoint; } -}; - // class SvxJavaOptionsPage ---------------------------------------------- class SvxJavaOptionsPage : public SfxTabPage diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src index c8306b7b8..e92291d36 100644 --- a/cui/source/options/optjava.src +++ b/cui/source/options/optjava.src @@ -50,6 +50,7 @@ TabPage RID_SVXPAGE_OPTIONS_JAVA }; CheckBox CB_JAVA_ENABLE { + HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE"; Pos = MAP_APPFONT ( 12, 14 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "~Use a Java runtime environment" ; @@ -75,18 +76,21 @@ TabPage RID_SVXPAGE_OPTIONS_JAVA }; PushButton PB_ADD { + HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD"; Pos = MAP_APPFONT ( 204 , 38 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Add..." ; }; PushButton PB_PARAMETER { + HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER"; Pos = MAP_APPFONT ( 204 , 55 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Parameters..." ; }; PushButton PB_CLASSPATH { + HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH"; Pos = MAP_APPFONT ( 204 , 72 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Class Path..." ; @@ -135,12 +139,14 @@ ModalDialog RID_SVXDLG_JAVA_PARAMETER }; Edit ED_PARAMETER { + HelpID = "cui:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER"; Pos = MAP_APPFONT ( 6 , 15 ) ; Size = MAP_APPFONT ( 202 , 12 ) ; Border = TRUE ; }; PushButton PB_ASSIGN { + HelpID = "cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN"; Pos = MAP_APPFONT ( 214 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Assign" ; @@ -153,6 +159,7 @@ ModalDialog RID_SVXDLG_JAVA_PARAMETER }; ListBox LB_ASSIGNED { + HelpID = "cui:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 42 ) ; Size = MAP_APPFONT ( 202 , 53 ) ; @@ -166,6 +173,7 @@ ModalDialog RID_SVXDLG_JAVA_PARAMETER }; PushButton PB_REMOVE { + HelpID = "cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_REMOVE"; Pos = MAP_APPFONT ( 214 , 42 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Remove" ; @@ -211,6 +219,7 @@ ModalDialog RID_SVXDLG_JAVA_CLASSPATH }; ListBox LB_PATH { + HelpID = "cui:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH"; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 172 , 72 ) ; Border = TRUE ; @@ -218,18 +227,21 @@ ModalDialog RID_SVXDLG_JAVA_CLASSPATH }; PushButton PB_ADDARCHIVE { + HelpID = "cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE"; Pos = MAP_APPFONT ( 184 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Add Archive..." ; }; PushButton PB_ADDPATH { + HelpID = "cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH"; Pos = MAP_APPFONT ( 184 , 31 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Add ~Folder" ; }; PushButton PB_REMOVE_PATH { + HelpID = "cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH"; Pos = MAP_APPFONT ( 184 , 48 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Remove" ; diff --git a/cui/source/options/optjsearch.src b/cui/source/options/optjsearch.src index 074f3a6b1..f058d13f4 100644 --- a/cui/source/options/optjsearch.src +++ b/cui/source/options/optjsearch.src @@ -45,96 +45,112 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS }; CheckBox CB_MATCH_CASE { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CASE"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "~uppercase/lowercase"; }; CheckBox CB_MATCH_FULL_HALF_WIDTH { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_FULL_HALF_WIDTH"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "~full-width/half-width forms"; }; CheckBox CB_MATCH_HIRAGANA_KATAKANA { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HIRAGANA_KATAKANA"; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "~hiragana/katakana"; }; CheckBox CB_MATCH_CONTRACTIONS { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CONTRACTIONS"; Pos = MAP_APPFONT ( 12 , 56 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "~contractions (yo-on, sokuon)"; }; CheckBox CB_MATCH_MINUS_DASH_CHOON { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_MINUS_DASH_CHOON"; Pos = MAP_APPFONT ( 12 , 70 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "~minus/dash/cho-on"; }; CheckBox CB_MATCH_REPEAT_CHAR_MARKS { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_REPEAT_CHAR_MARKS"; Pos = MAP_APPFONT ( 12 , 84 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "'re~peat character' marks"; }; CheckBox CB_MATCH_VARIANT_FORM_KANJI { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_VARIANT_FORM_KANJI"; Pos = MAP_APPFONT ( 12 , 98 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "~variant-form kanji (itaiji)"; }; CheckBox CB_MATCH_OLD_KANA_FORMS { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_OLD_KANA_FORMS"; Pos = MAP_APPFONT ( 12 , 112) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "~old Kana forms"; }; CheckBox CB_MATCH_DIZI_DUZU { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_DIZI_DUZU"; Pos = MAP_APPFONT ( 136 , 14 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "~di/zi, du/zu"; }; CheckBox CB_MATCH_BAVA_HAFA { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_BAVA_HAFA"; Pos = MAP_APPFONT ( 136 , 28 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "~ba/va, ha/fa"; }; CheckBox CB_MATCH_TSITHICHI_DHIZI { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_TSITHICHI_DHIZI"; Pos = MAP_APPFONT ( 136 , 42 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "~tsi/thi/chi, dhi/zi"; }; CheckBox CB_MATCH_HYUFYU_BYUVYU { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HYUFYU_BYUVYU"; Pos = MAP_APPFONT ( 136 , 56 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "h~yu/fyu, byu/vyu"; }; CheckBox CB_MATCH_SESHE_ZEJE { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_SESHE_ZEJE"; Pos = MAP_APPFONT ( 136 , 70 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "~se/she, ze/je"; }; CheckBox CB_MATCH_IAIYA { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_IAIYA"; Pos = MAP_APPFONT ( 136 , 84 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "~ia/iya (piano/piyano)"; }; CheckBox CB_MATCH_KIKU { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_KIKU"; Pos = MAP_APPFONT ( 136 , 98 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "~ki/ku (tekisuto/tekusuto)"; }; CheckBox CB_MATCH_PROLONGED_SOUNDMARK { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_PROLONGED_SOUNDMARK"; Pos = MAP_APPFONT ( 136 , 112 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "Prolon~ged vowels (ka-/kaa)"; @@ -147,18 +163,21 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS }; CheckBox CB_IGNORE_PUNCTUATION { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_PUNCTUATION"; Pos = MAP_APPFONT ( 12 , 139 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "Pu~nctuation characters"; }; CheckBox CB_IGNORE_WHITESPACES { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_WHITESPACES"; Pos = MAP_APPFONT ( 12 , 153 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "~Whitespace characters"; }; CheckBox CB_IGNORE_MIDDLE_DOT { + HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_MIDDLE_DOT"; Pos = MAP_APPFONT ( 136 , 139 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "Midd~le dots"; diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src index 3b94571b0..31e187a21 100644 --- a/cui/source/options/optlingu.src +++ b/cui/source/options/optlingu.src @@ -59,6 +59,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES }; ListBox LB_EDIT_MODULES_LANGUAGE { + HelpID = "cui:ListBox:RID_SVXDLG_EDIT_MODULES:LB_EDIT_MODULES_LANGUAGE"; Border = TRUE ; Pos = MAP_APPFONT ( 83 , 14 ) ; Size = MAP_APPFONT ( 95 , 80 ) ; @@ -74,6 +75,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES }; PushButton PB_EDIT_MODULES_PRIO_UP { + HelpID = "cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_UP"; Pos = MAP_APPFONT ( 184 , 32 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -81,6 +83,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES }; PushButton PB_EDIT_MODULES_PRIO_DOWN { + HelpID = "cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_DOWN"; Pos = MAP_APPFONT ( 184 , 49 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -88,6 +91,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES }; PushButton PB_EDIT_MODULES_PRIO_BACK { + HelpID = "cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_BACK"; Pos = MAP_APPFONT ( 184 , 66 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -164,6 +168,7 @@ ModalDialog RID_SVXDLG_LNG_ED_NUM_PREBREAK }; NumericField ED_PREBREAK { + HelpID = "cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 14 ) ; Size = MAP_APPFONT ( 31 , 12 ) ; @@ -220,6 +225,7 @@ TabPage RID_SFXPAGE_LINGU }; PushButton PB_LINGU_MODULES_EDIT { + HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_MODULES_EDIT"; Pos = MAP_APPFONT ( 198 , 25 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -241,6 +247,7 @@ TabPage RID_SFXPAGE_LINGU }; PushButton PB_LINGU_DICS_NEW_DIC { + HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_NEW_DIC"; Pos = MAP_APPFONT ( 198 , 70 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -248,6 +255,7 @@ TabPage RID_SFXPAGE_LINGU }; PushButton PB_LINGU_DICS_EDIT_DIC { + HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_EDIT_DIC"; Pos = MAP_APPFONT ( 198 , 87 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -255,6 +263,7 @@ TabPage RID_SFXPAGE_LINGU }; PushButton PB_LINGU_DICS_DEL_DIC { + HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_DEL_DIC"; Pos = MAP_APPFONT ( 198 , 104 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -276,6 +285,7 @@ TabPage RID_SFXPAGE_LINGU }; PushButton PB_LINGU_OPTIONS_EDIT { + HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_OPTIONS_EDIT"; Pos = MAP_APPFONT ( 198 , 133 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/cui/source/options/optmemory.src b/cui/source/options/optmemory.src index 37f4563e6..f7e66cea9 100644 --- a/cui/source/options/optmemory.src +++ b/cui/source/options/optmemory.src @@ -51,6 +51,7 @@ TabPage OFA_TP_MEMORY }; NumericField ED_UNDO { + HelpID = "cui:NumericField:OFA_TP_MEMORY:ED_UNDO"; Border = TRUE ; Pos = MAP_APPFONT( COL3, ROW1 ); Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ); @@ -80,6 +81,7 @@ TabPage OFA_TP_MEMORY }; NumericField NF_GRAPHICCACHE { + HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE"; Border = TRUE ; Pos = MAP_APPFONT( COL3, ROW3 ); Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ); @@ -103,6 +105,7 @@ TabPage OFA_TP_MEMORY }; NumericField NF_GRAPHICOBJECTCACHE { + HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE"; Border = TRUE ; Pos = MAP_APPFONT( COL3, ROW4 ); Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ); @@ -127,6 +130,7 @@ TabPage OFA_TP_MEMORY }; TimeField TF_GRAPHICOBJECTTIME { + HelpID = "cui:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME"; Border = TRUE ; Pos = MAP_APPFONT( COL3, ROW5 ); Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ); @@ -179,6 +183,7 @@ TabPage OFA_TP_MEMORY }; NumericField NF_OLECACHE { + HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_OLECACHE"; Border = TRUE ; Pos = MAP_APPFONT( COL3, ROW7 ); Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ); @@ -195,6 +200,7 @@ TabPage OFA_TP_MEMORY }; CheckBox CB_QUICKLAUNCH { + HelpID = "cui:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH"; Pos = MAP_APPFONT( COL1, ROW9 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "Load %PRODUCTNAME during system start-up"; diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 75b9c7832..0f2d4a02f 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -35,7 +35,6 @@ #include <vcl/msgbox.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/app.hxx> -#include <svl/pickerhelper.hxx> #include <svl/aeitem.hxx> #include <svtools/svtabbx.hxx> #include <svtools/filedlg.hxx> @@ -639,8 +638,6 @@ IMPL_LINK( SvxPathTabPage, PathHdl_Impl, PushButton *, EMPTYARG ) xFolderPicker = ::com::sun::star::uno::Reference< XFolderPicker >( xFactory->createInstance( aService ), UNO_QUERY ); -// svt::SetDialogHelpId( xFolderPicker, HID_OPTIONS_PATHS_SELECTFOLDER ); - INetURLObject aURL( sWritable, INET_PROT_FILE ); xFolderPicker->setDisplayDirectory( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src index 22e455720..1ac721286 100644 --- a/cui/source/options/optpath.src +++ b/cui/source/options/optpath.src @@ -65,12 +65,14 @@ TabPage RID_SFXPAGE_PATH }; PushButton BTN_PATH { + HelpID = "cui:PushButton:RID_SFXPAGE_PATH:BTN_PATH"; Pos = MAP_APPFONT ( 183 , 165 ) ; Size = MAP_APPFONT ( 65 , 14 ) ; Text [ en-US ] = "~Edit..." ; }; PushButton BTN_STANDARD { + HelpID = "cui:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD"; Pos = MAP_APPFONT ( 115 , 165 ) ; Size = MAP_APPFONT ( 65 , 14 ) ; Text [ en-US ] = "~Default" ; diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index e0e832e39..8c52d9a40 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -78,37 +78,6 @@ using rtl::OUString; #define WININDEX_AUTOSAVE ((USHORT)6) #define WININDEX_SAVEURL_RELFSYS ((USHORT)9) -// -------------------- -------------------------------------------------- -class FilterWarningDialog_Impl : public ModalDialog -{ - OKButton aOk; - CancelButton aCancel; - FixedImage aImage; - FixedInfo aFilterWarningFT; - - public: - FilterWarningDialog_Impl(Window* pParent); - - void SetFilterName(const String& rFilterUIName); -}; -// ---------------------------------------------------------------------- -FilterWarningDialog_Impl::FilterWarningDialog_Impl(Window* pParent) : - ModalDialog(pParent, CUI_RES( RID_SVXDLG_FILTER_WARNING ) ), - aOk( this, CUI_RES(PB_OK )), - aCancel( this, CUI_RES(PB_CANCEL )), - aImage( this, CUI_RES(IMG_WARNING )), - aFilterWarningFT( this, CUI_RES(FT_FILTER_WARNING )) -{ - FreeResource(); - aImage.SetImage(WarningBox::GetStandardImage()); -} -// ---------------------------------------------------------------------- -void FilterWarningDialog_Impl::SetFilterName(const String& rFilterUIName) -{ - String sTmp(aFilterWarningFT.GetText()); - sTmp.SearchAndReplaceAscii("%1", rFilterUIName); - aFilterWarningFT.SetText(sTmp); -} // ---------------------------------------------------------------------- #ifdef FILTER_WARNING_ENABLED class SvxAlienFilterWarningConfig_Impl : public utl::ConfigItem @@ -324,23 +293,6 @@ SfxTabPage* SfxSaveTabPage::Create( Window* pParent, return ( new SfxSaveTabPage( pParent, rAttrSet ) ); } -/* -----------------------------05.04.01 13:10-------------------------------- - - ---------------------------------------------------------------------------*/ -OUString lcl_ExtractUIName(const Sequence<PropertyValue> rProperties) -{ - OUString sRet; - const PropertyValue* pProperties = rProperties.getConstArray(); - for(int nProp = 0; nProp < rProperties.getLength(); nProp++) - { - if(!pProperties[nProp].Name.compareToAscii("UIName")) - { - pProperties[nProp].Value >>= sRet; - break; - } - } - return sRet; -} // ----------------------------------------------------------------------- bool SfxSaveTabPage::AcceptFilter( USHORT nPos ) { diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src index 1a44118d6..93b42ec2a 100644 --- a/cui/source/options/optsave.src +++ b/cui/source/options/optsave.src @@ -51,12 +51,14 @@ TabPage RID_SFXPAGE_SAVE }; CheckBox CB_LOAD_SETTINGS { + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS"; Pos = MAP_APPFONT ( 12 , 11 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text [ en-US ] = "Load user-specific settings with the document"; }; CheckBox CB_LOAD_DOCPRINTER { + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER"; Pos = MAP_APPFONT ( 12 , 22 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text [ en-US ] = "Load printer settings with the document"; @@ -69,6 +71,7 @@ TabPage RID_SFXPAGE_SAVE }; CheckBox BTN_DOCINFO { + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_DOCINFO"; Pos = MAP_APPFONT ( 12 , 41 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text [ en-US ] = "~Edit document properties before saving" ; @@ -82,18 +85,21 @@ TabPage RID_SFXPAGE_SAVE }; CheckBox BTN_BACKUP { + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP"; Pos = MAP_APPFONT ( 12 , 52 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text [ en-US ] = "Al~ways create backup copy" ; }; CheckBox BTN_AUTOSAVE { + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE"; Pos = MAP_APPFONT ( 12 , 63 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text [ en-US ] = "Save ~AutoRecovery information every" ; }; NumericField ED_AUTOSAVE { + HelpID = "cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE"; Border = TRUE ; Pos = MAP_APPFONT ( 180 , 62 ) ; Size = MAP_APPFONT ( 21 , 12 ) ; @@ -116,12 +122,14 @@ TabPage RID_SFXPAGE_SAVE }; CheckBox BTN_RELATIVE_FSYS { + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS"; Pos = MAP_APPFONT ( 12 , 74 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text [ en-US ] = "Save URLs relative to file system" ; }; CheckBox BTN_RELATIVE_INET { + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET"; Pos = MAP_APPFONT ( 12 , 85 ) ; Size = MAP_APPFONT ( 248 , 10 ) ; Text [ en-US ] = "Save URLs relative to internet" ; @@ -140,6 +148,7 @@ TabPage RID_SFXPAGE_SAVE }; ListBox LB_ODF_VERSION { + HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_ODF_VERSION"; Pos = MAP_APPFONT ( 136 , 105 ) ; Size = MAP_APPFONT ( 108 , 58 ) ; Border = TRUE; @@ -153,12 +162,14 @@ TabPage RID_SFXPAGE_SAVE }; CheckBox BTN_NOPRETTYPRINTING { + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING"; Pos = MAP_APPFONT ( 12 , 120 ) ; Size = MAP_APPFONT ( 248 , 10 ) ; Text [ en-US ] = "Size optimization for ODF format" ; }; CheckBox BTN_WARNALIENFORMAT { + HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT"; Pos = MAP_APPFONT ( 12 , 131 ) ; Size = MAP_APPFONT ( 248 , 10 ) ; Text [ en-US ] = "Warn when not saving in ODF or default format" ; @@ -177,6 +188,7 @@ TabPage RID_SFXPAGE_SAVE }; ListBox LB_APP { + HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_APP"; Pos = MAP_APPFONT ( 12 , 153 ) ; Size = MAP_APPFONT ( 108 , 58 ) ; Border = TRUE; @@ -200,6 +212,7 @@ TabPage RID_SFXPAGE_SAVE }; ListBox LB_FILTER { + HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_FILTER"; Pos = MAP_APPFONT ( 136 , 153 ) ; Size = MAP_APPFONT ( 108 , 58 ) ; Border = TRUE; diff --git a/cui/source/options/optspell.src b/cui/source/options/optspell.src index bd242a87d..9b46258ee 100644 --- a/cui/source/options/optspell.src +++ b/cui/source/options/optspell.src @@ -39,6 +39,7 @@ TabPage RID_SFXPAGE_SPELL Text [ en-US ] = "Spellcheck" ; PushButton BTN_BOOK { + HelpID = "cui:PushButton:RID_SFXPAGE_SPELL:BTN_BOOK"; Pos = MAP_APPFONT ( 128 , 6 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Edit..." ; @@ -46,6 +47,7 @@ TabPage RID_SFXPAGE_SPELL }; MultiListBox LB_BOOK { + HelpID = "cui:MultiListBox:RID_SFXPAGE_SPELL:LB_BOOK"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 103 , 47 ) ; @@ -62,6 +64,7 @@ TabPage RID_SFXPAGE_SPELL }; CheckBox BTN_CAPS { + HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_CAPS"; Pos = MAP_APPFONT ( 12 , 82 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Großgeschriebene Wörter : ~Gro˜geschriebene W÷rter */ @@ -71,6 +74,7 @@ TabPage RID_SFXPAGE_SPELL }; CheckBox BTN_NUMS { + HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_NUMS"; Pos = MAP_APPFONT ( 12 , 95 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Wörter mit Ziffern : ~W÷rter mit Ziffern */ @@ -80,6 +84,7 @@ TabPage RID_SFXPAGE_SPELL }; CheckBox BTN_UPLOW { + HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_UPLOW"; Pos = MAP_APPFONT ( 12 , 108 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; /* ### ACHTUNG: Neuer Text in Resource? Groß- u. ~Kleinschreibung : Gro˜- u. ~Kleinschreibung */ diff --git a/cui/source/options/optupdt.src b/cui/source/options/optupdt.src index f71273c5a..ad1202739 100644 --- a/cui/source/options/optupdt.src +++ b/cui/source/options/optupdt.src @@ -47,24 +47,28 @@ TabPage RID_SVXPAGE_ONLINEUPDATE }; CheckBox CB_AUTOCHECK { + HelpID = "cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTOCHECK"; Pos = MAP_APPFONT ( 12, 14 ) ; Size = MAP_APPFONT ( 210, 10 ) ; Text [ en-US ] = "~Check for updates automatically" ; }; RadioButton RB_EVERYDAY { + HelpID = "cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYDAY"; Pos = MAP_APPFONT ( 18, 27 ) ; Size = MAP_APPFONT ( 160, 10 ) ; Text [ en-US ] = "Every Da~y" ; }; RadioButton RB_EVERYWEEK { + HelpID = "cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYWEEK"; Pos = MAP_APPFONT ( 18, 40 ) ; Size = MAP_APPFONT ( 160, 10 ) ; Text [ en-US ] = "Every ~Week" ; }; RadioButton RB_EVERYMONTH { + HelpID = "cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYMONTH"; Pos = MAP_APPFONT ( 18, 53 ) ; Size = MAP_APPFONT ( 160, 10 ) ; Text [ en-US ] = "Every ~Month" ; @@ -77,12 +81,14 @@ TabPage RID_SVXPAGE_ONLINEUPDATE }; PushButton PB_CHECKNOW { + HelpID = "cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW"; Pos = MAP_APPFONT ( 12, 82 ) ; Size = MAP_APPFONT ( 50, 14 ) ; Text [ en-US ] = "Check ~now" ; }; CheckBox CB_AUTODOWNLOAD { + HelpID = "cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD"; Pos = MAP_APPFONT ( 12, 130 ) ; Size = MAP_APPFONT ( 160, 10 ) ; Text [ en-US ] = "~Download updates automatically" ; @@ -100,6 +106,7 @@ TabPage RID_SVXPAGE_ONLINEUPDATE }; PushButton PB_CHANGEPATH { + HelpID = "cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHANGEPATH"; Pos = MAP_APPFONT ( 162, 151 ) ; Size = MAP_APPFONT ( 50, 14 ) ; Text [ en-US ] = "Ch~ange..." ; diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index 34289b9b2..f1e6b9525 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -115,13 +115,6 @@ namespace offapp { return m_pImpl->getDriverImplNames().end(); } - - //-------------------------------------------------------------------- - sal_Int32 ODriverEnumeration::size() const throw() - { - return m_pImpl->getDriverImplNames().size(); - } - //........................................................................ } // namespace offapp //........................................................................ diff --git a/cui/source/options/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx index e8b03b273..60f6eb6b9 100644 --- a/cui/source/options/sdbcdriverenum.hxx +++ b/cui/source/options/sdbcdriverenum.hxx @@ -64,7 +64,6 @@ namespace offapp const_iterator begin() const throw(); const_iterator end() const throw(); - sal_Int32 size() const throw(); }; //........................................................................ diff --git a/cui/source/options/securityoptions.src b/cui/source/options/securityoptions.src index cff58746c..632f28794 100644 --- a/cui/source/options/securityoptions.src +++ b/cui/source/options/securityoptions.src @@ -61,6 +61,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS }; CheckBox CB_SAVESENDDOCS { + HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SAVESENDDOCS"; Pos = MAP_APPFONT( COL_2, ROW_2 ); Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "When saving or sending"; @@ -72,6 +73,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS }; CheckBox CB_SIGNDOCS { + HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SIGNDOCS"; Pos = MAP_APPFONT( COL_2 + CHECKBOX_WIDTH + RSC_SP_CTRL_X, ROW_2 ); Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "When signing"; @@ -83,6 +85,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS }; CheckBox CB_PRINTDOCS { + HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_PRINTDOCS"; Pos = MAP_APPFONT( COL_2, ROW_3 ); Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "When printing"; @@ -94,6 +97,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS }; CheckBox CB_CREATEPDF { + HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CREATEPDF"; Pos = MAP_APPFONT( COL_2 + CHECKBOX_WIDTH + RSC_SP_CTRL_X, ROW_3 ); Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "When creating PDF files"; @@ -111,6 +115,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS }; CheckBox CB_REMOVEINFO { + HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_REMOVEINFO"; Pos = MAP_APPFONT( COL_1, ROW_5 ); Size = MAP_APPFONT( COL_3-COL_1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "Remove personal information on saving"; @@ -122,6 +127,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS }; CheckBox CB_RECOMMENDPWD { + HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_RECOMMENDPWD"; Pos = MAP_APPFONT( COL_1, ROW_6 ); Size = MAP_APPFONT( COL_3-COL_1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "Recommend password protection on saving"; @@ -133,6 +139,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS }; CheckBox CB_CTRLHYPERLINK { + HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK"; Pos = MAP_APPFONT( COL_1, ROW_7 ); Size = MAP_APPFONT( COL_3-COL_1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "Ctrl-click required to follow hyperlinks"; diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 257d44d98..fa11d7bcd 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/frame/XLoadable.hpp> #include <tools/rcid.h> #include <tools/shl.hxx> +#include <tools/urlobj.hxx> #include <comphelper/processfactory.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/beans/PropertyValue.hpp> @@ -2709,22 +2710,6 @@ short OfaTreeOptionsDialog::Execute() // class ExtensionsTabPage ----------------------------------------------- ExtensionsTabPage::ExtensionsTabPage( - Window* pParent, const ResId& rResId, const rtl::OUString& rPageURL, - const rtl::OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) : - - TabPage( pParent, rResId ), - - m_sPageURL ( rPageURL ), - m_sEventHdl ( rEvtHdl ), - m_xWinProvider ( rProvider ), - m_bIsWindowHidden ( false ) - -{ -} - -// ----------------------------------------------------------------------- - -ExtensionsTabPage::ExtensionsTabPage( Window* pParent, WinBits nStyle, const rtl::OUString& rPageURL, const rtl::OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) : @@ -2862,15 +2847,3 @@ void ExtensionsTabPage::SavePage() { DispatchAction( C2U("ok") ); } - -// ----------------------------------------------------------------------- - -void ExtensionsTabPage::HideWindow() -{ - if ( !m_bIsWindowHidden && m_xPage.is() ) - { - m_xPage->setVisible( sal_False ); - m_bIsWindowHidden = true; - } -} - diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src index 45c81241e..4c41df2d2 100644 --- a/cui/source/options/treeopt.src +++ b/cui/source/options/treeopt.src @@ -63,6 +63,7 @@ ModalDialog RID_OFADLG_OPTIONS_TREE }; PushButton PB_BACK { + HelpID = "cui:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK"; Pos = MAP_APPFONT ( COL_10, ROW_3 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; TabStop = TRUE ; diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 2eeec105f..8f55c6f51 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -311,10 +311,8 @@ IMPL_LINK( WebConnectionInfoDialog, ChangePasswordHdl, PushButton*, EMPTYARG ) ::rtl::OUString aURL = m_aPasswordsLB.GetEntryText( pEntry, 0 ); ::rtl::OUString aUserName = m_aPasswordsLB.GetEntryText( pEntry, 1 ); - ::comphelper::DocPasswordRequest* pPasswordRequest - = new ::comphelper::DocPasswordRequest( - ::comphelper::DocPasswordRequestType_STANDARD, - task::PasswordRequestMode_PASSWORD_CREATE, aURL ); + ::comphelper::SimplePasswordRequest* pPasswordRequest + = new ::comphelper::SimplePasswordRequest( task::PasswordRequestMode_PASSWORD_CREATE ); uno::Reference< task::XInteractionRequest > rRequest( pPasswordRequest ); uno::Reference< task::XInteractionHandler > xInteractionHandler( diff --git a/cui/source/options/webconninfo.src b/cui/source/options/webconninfo.src index 17494aa98..45ab62167 100644 --- a/cui/source/options/webconninfo.src +++ b/cui/source/options/webconninfo.src @@ -56,18 +56,21 @@ ModalDialog RID_SVXDLG_WEBCONNECTION_INFO }; PushButton PB_REMOVE { + HelpID = "cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVE"; Pos = MAP_APPFONT ( COL_0 , ROW_3 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; Text [ en-US ] = "Remove"; }; PushButton PB_REMOVEALL { + HelpID = "cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVEALL"; Pos = MAP_APPFONT ( COL_1 , ROW_3 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; Text [ en-US ] = "Remove All"; }; PushButton PB_CHANGE { + HelpID = "cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_CHANGE"; Pos = MAP_APPFONT ( COL_C , ROW_3 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; Text [ en-US ] = "Change Password..."; diff --git a/cui/source/tabpages/align.src b/cui/source/tabpages/align.src index 50cc9dc48..ba52e3b28 100644 --- a/cui/source/tabpages/align.src +++ b/cui/source/tabpages/align.src @@ -57,6 +57,7 @@ TabPage RID_SVXPAGE_ALIGNMENT }; ListBox LB_HORALIGN { + HelpID = "cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN"; Border = TRUE; Pos = MAP_APPFONT ( 12 , 25 ); Size = MAP_APPFONT ( 100 , 60 ); @@ -80,6 +81,7 @@ TabPage RID_SVXPAGE_ALIGNMENT }; MetricField ED_INDENT { + HelpID = "cui:MetricField:RID_SVXPAGE_ALIGNMENT:ED_INDENT"; Border = TRUE ; Pos = MAP_APPFONT ( 118 , 25 ) ; Size = MAP_APPFONT ( 36 , 12 ) ; @@ -98,6 +100,7 @@ TabPage RID_SVXPAGE_ALIGNMENT }; ListBox LB_VERALIGN { + HelpID = "cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN"; Border = TRUE; Pos = MAP_APPFONT ( 160 , 25 ); Size = MAP_APPFONT ( 88 , 60 ); @@ -119,6 +122,7 @@ TabPage RID_SVXPAGE_ALIGNMENT }; TriStateBox BTN_TXTSTACKED { + HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_TXTSTACKED"; Pos = MAP_APPFONT ( 133 , 54 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; TabStop = TRUE ; @@ -139,6 +143,7 @@ TabPage RID_SVXPAGE_ALIGNMENT }; NumericField NF_DEGREES { + HelpID = "cui:NumericField:RID_SVXPAGE_ALIGNMENT:NF_DEGREES"; Border = TRUE ; Pos = MAP_APPFONT ( 72 , 65 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -165,6 +170,7 @@ TabPage RID_SVXPAGE_ALIGNMENT }; TriStateBox BTN_ASIAN_VERTICAL { + HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_ASIAN_VERTICAL"; Pos = MAP_APPFONT ( 143 , 68 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; TabStop = TRUE ; @@ -178,18 +184,21 @@ TabPage RID_SVXPAGE_ALIGNMENT }; TriStateBox BTN_WRAP { + HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP"; Pos = MAP_APPFONT ( 12 , 126 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text [ en-US ] = "~Wrap text automatically" ; }; TriStateBox BTN_HYPH { + HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_HYPH"; Pos = MAP_APPFONT ( 22 , 139 ) ; Size = MAP_APPFONT ( 226 , 10 ) ; Text [ en-US ] = "Hyphenation ~active"; }; TriStateBox BTN_SHRINK { + HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_SHRINK"; Pos = MAP_APPFONT( 12, 152 ); Size = MAP_APPFONT( 236, 10 ); Text [ en-US ] = "~Shrink to fit cell size"; @@ -202,6 +211,7 @@ TabPage RID_SVXPAGE_ALIGNMENT }; ListBox LB_FRAMEDIR { + HelpID = "cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_FRAMEDIR"; Pos = MAP_APPFONT( 78 , 168 ); Size = MAP_APPFONT( 170 , 50 ); Border = TRUE; diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src index eea4e599f..cc321322f 100644 --- a/cui/source/tabpages/autocdlg.src +++ b/cui/source/tabpages/autocdlg.src @@ -173,6 +173,7 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY }; PushButton PB_EDIT { + HelpID = "cui:PushButton:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT"; Pos = MAP_APPFONT ( 6 , 162 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Edit..." ; @@ -247,7 +248,7 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY ModalDialog RID_OFADLG_PRCNT_SET { - HelpID = SID_AUTOFORMAT ; + HelpID = CMD_SID_AUTOFORMAT ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 155 , 43 ) ; @@ -273,6 +274,7 @@ ModalDialog RID_OFADLG_PRCNT_SET }; MetricField ED_RIGHT_MARGIN { + HelpID = "cui:MetricField:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 7 , 14 ) ; Size = MAP_APPFONT ( 31 , 12 ) ; @@ -312,6 +314,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE }; Edit ED_SHORT { + HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT"; Pos = MAP_APPFONT ( 7 , 13 ) ; Size = MAP_APPFONT ( 60 , 12 ) ; Border = TRUE ; @@ -326,6 +329,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE }; Edit ED_REPLACE { + HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE"; Pos = MAP_APPFONT ( 71 , 13 ) ; Size = MAP_APPFONT ( 123 , 12 ) ; Border = TRUE ; @@ -333,6 +337,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE }; CheckBox CB_TEXT_ONLY { + HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY"; Pos = MAP_APPFONT ( 140 , 3 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; TabStop = TRUE ; @@ -340,6 +345,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE }; PushButton PB_NEW_REPLACE { + HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE"; Pos = MAP_APPFONT ( 198 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -347,6 +353,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE }; PushButton PB_DELETE_REPLACE { + HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE"; Pos = MAP_APPFONT ( 198 , 32 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -385,6 +392,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT }; Edit ED_ABBREV { + HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV"; Pos = MAP_APPFONT ( 7 , 14 ) ; Size = MAP_APPFONT ( 123 , 12 ) ; TabStop = TRUE ; @@ -392,6 +400,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT }; ListBox LB_ABBREV { + HelpID = "cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV"; Pos = MAP_APPFONT ( 7 , 30 ) ; Size = MAP_APPFONT ( 123 , 58 ) ; TabStop = TRUE ; @@ -401,6 +410,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT }; PushButton PB_NEWABBREV { + HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV"; Pos = MAP_APPFONT ( 198 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -409,6 +419,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT }; PushButton PB_DELABBREV { + HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV"; Pos = MAP_APPFONT ( 198 , 31 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -417,6 +428,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT }; CheckBox CB_AUTOABBREV { + HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV"; Pos = MAP_APPFONT ( 137 , 78 ) ; Size = MAP_APPFONT ( 111 , 10 ) ; Text [ en-US ] = "~AutoInclude"; @@ -431,6 +443,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT }; Edit ED_DOUBLE_CAPS { + HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS"; Pos = MAP_APPFONT ( 7 , 105 ) ; Size = MAP_APPFONT ( 123 , 12 ) ; TabStop = TRUE ; @@ -438,6 +451,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT }; ListBox LB_DOUBLE_CAPS { + HelpID = "cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS"; Pos = MAP_APPFONT ( 7 , 120 ) ; Size = MAP_APPFONT ( 123 , 59 ) ; TabStop = TRUE ; @@ -447,6 +461,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT }; PushButton PB_NEWDOUBLECAPS { + HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS"; Pos = MAP_APPFONT ( 198 , 105 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Disable = TRUE ; @@ -454,6 +469,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT }; PushButton PB_DELDOUBLECAPS { + HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS"; Pos = MAP_APPFONT ( 198 , 122 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Disable = TRUE ; @@ -461,6 +477,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT }; CheckBox CB_AUTOCAPS { + HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS"; Pos = MAP_APPFONT ( 137 , 169 ) ; Size = MAP_APPFONT ( 111 , 10 ) ; Text [ en-US ] = "A~utoInclude"; @@ -509,8 +526,9 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE Size = MAP_APPFONT ( 122 , 8 ) ; Text [ en-US ] = "Single quotes" ; }; - Checkbox CB_SGL_TYPO + CheckBox CB_SGL_TYPO { + HelpId = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO"; Pos = MAP_APPFONT ( 7 , 101 ) ; Size = MAP_APPFONT ( 86 , 10 ) ; Text [ en-US ] = "Repla~ce" ; @@ -523,6 +541,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE }; PushButton PB_SGL_STARTQUOTE { + HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE"; Pos = MAP_APPFONT ( 10 , 125 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; Text = "\'" ; @@ -541,6 +560,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE }; PushButton PB_SGL_ENDQUOTE { + HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE"; Pos = MAP_APPFONT ( 10 , 151 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; Text = "\'" ; @@ -553,6 +573,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE }; PushButton PB_SGL_STD { + HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD"; Pos = MAP_APPFONT ( 7 , 167 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -566,6 +587,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE }; CheckBox CB_TYPO { + HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO"; Pos = MAP_APPFONT ( 137 , 101 ) ; Size = MAP_APPFONT ( 86 , 10 ) ; TabStop = TRUE ; @@ -579,6 +601,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE }; PushButton PB_STARTQUOTE { + HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE"; Pos = MAP_APPFONT ( 140 , 125 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; Text = "\"" ; @@ -597,6 +620,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE }; PushButton PB_ENDQUOTE { + HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE"; Pos = MAP_APPFONT ( 140 , 151 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; Text = "\"" ; @@ -609,6 +633,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE }; PushButton PB_DBL_STD { + HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD"; Pos = MAP_APPFONT ( 137 , 167 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -642,30 +667,35 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS Hide = TRUE ; CheckBox CB_ACTIV { + HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV"; Pos = MAP_APPFONT( 4, 3 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "Enable word ~completion"; }; CheckBox CB_APPEND_SPACE { + HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_APPEND_SPACE"; Pos = MAP_APPFONT( 10, 17 ); Size = MAP_APPFONT( 110, 10 ); Text [ en-US ] = "~Append space"; }; CheckBox CB_AS_TIP { + HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP"; Pos = MAP_APPFONT( 10, 31 ); Size = MAP_APPFONT( 110, 10 ); Text [ en-US ] = "~Show as tip"; }; CheckBox CB_COLLECT { + HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT"; Pos = MAP_APPFONT( 4, 45 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "C~ollect words"; }; CheckBox CB_REMOVE_LIST { + HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_REMOVE_LIST"; Pos = MAP_APPFONT( 10, 59 ); Size = MAP_APPFONT( 110, 40 ); WordBreak = TRUE; @@ -679,6 +709,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS }; ListBox DCB_EXPAND_KEY { + HelpID = "cui:ListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY"; Pos = MAP_APPFONT( 4, 113 ); Size = MAP_APPFONT( 116, 60 ); TabStop = TRUE; @@ -694,6 +725,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS }; NumericField NF_MIN_WORDLEN { + HelpID = "cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN"; Border = TRUE; Pos = MAP_APPFONT( 4, 140 ); Size = MAP_APPFONT( 30, 12 ); @@ -716,6 +748,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS }; NumericField NF_MAX_ENTRIES { + HelpID = "cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES"; Border = TRUE; Pos = MAP_APPFONT( 4, 167 ); Size = MAP_APPFONT( 30, 12 ); @@ -732,6 +765,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS }; MultiListBox LB_ENTRIES { + HelpID = "cui:MultiListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES"; Pos = MAP_APPFONT( 127, 3 ); Size = MAP_APPFONT( 121, 158 ); TabStop = TRUE; @@ -742,6 +776,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS }; PushButton PB_ENTRIES { + HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES"; Pos = MAP_APPFONT( 127, 165 ); Size = MAP_APPFONT( 121, 14 ); TabStop = TRUE ; @@ -767,6 +802,7 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS CheckBox CB_SMARTTAGS { + HelpID = "cui:CheckBox:RID_OFAPAGE_SMARTTAG_OPTIONS:CB_SMARTTAGS"; Pos = MAP_APPFONT( 4, 3 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "Label text with smart tags"; @@ -789,6 +825,7 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS PushButton PB_SMARTTAGS { + HelpID = "cui:PushButton:RID_OFAPAGE_SMARTTAG_OPTIONS:PB_SMARTTAGS"; Pos = MAP_APPFONT ( 188 , 25 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Properties..."; diff --git a/cui/source/tabpages/backgrnd.src b/cui/source/tabpages/backgrnd.src index 21b87099d..66b0de288 100644 --- a/cui/source/tabpages/backgrnd.src +++ b/cui/source/tabpages/backgrnd.src @@ -54,6 +54,7 @@ TabPage RID_SVXPAGE_BACKGROUND }; ListBox LB_SELECTOR { + HelpID = "cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_SELECTOR"; Hide = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 33 , 3 ) ; @@ -76,6 +77,7 @@ TabPage RID_SVXPAGE_BACKGROUND }; ListBox LB_TBL_BOX { + HelpID = "cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX"; Hide = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 172 , 3 ) ; @@ -90,6 +92,7 @@ TabPage RID_SVXPAGE_BACKGROUND }; ListBox LB_PARA_BOX { + HelpID = "cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX"; Hide = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 172 , 3 ) ; @@ -140,6 +143,7 @@ TabPage RID_SVXPAGE_BACKGROUND }; MetricField MF_COL_TRANS { + HelpID = "cui:MetricField:RID_SVXPAGE_BACKGROUND:MF_COL_TRANS"; Hide = TRUE ; Pos = MAP_APPFONT ( 218 , 74 + RSC_SP_CTRL_Y ) ; Size = MAP_APPFONT ( 30 , 12) ; @@ -165,6 +169,7 @@ TabPage RID_SVXPAGE_BACKGROUND }; PushButton BTN_BROWSE { + HelpID = "cui:PushButton:RID_SVXPAGE_BACKGROUND:BTN_BROWSE"; Hide = TRUE ; Pos = MAP_APPFONT ( 6 + RSC_SP_FLGR_INNERBORDER_LEFT , 23 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ; Size = MAP_APPFONT ( 60 , 14 ) ; @@ -172,6 +177,7 @@ TabPage RID_SVXPAGE_BACKGROUND }; CheckBox BTN_LINK { + HelpID = "cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_LINK"; Hide = TRUE ; Pos = MAP_APPFONT ( 6 + RSC_SP_FLGR_INNERBORDER_LEFT + 60 + 2*RSC_SP_CTRL_X, 23 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + 3 ) ; Size = MAP_APPFONT ( 78 , 10 ) ; @@ -193,6 +199,7 @@ TabPage RID_SVXPAGE_BACKGROUND }; RadioButton BTN_POSITION { + HelpID = "cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 89 ) ; Size = MAP_APPFONT ( 49 , 10 ) ; @@ -200,6 +207,7 @@ TabPage RID_SVXPAGE_BACKGROUND }; RadioButton BTN_AREA { + HelpID = "cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_AREA"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 103 ) ; Size = MAP_APPFONT ( 49 , 10 ) ; @@ -208,6 +216,7 @@ TabPage RID_SVXPAGE_BACKGROUND }; RadioButton BTN_TILE { + HelpID = "cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_TILE"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 117 ) ; Size = MAP_APPFONT ( 49 , 10 ) ; @@ -231,6 +240,7 @@ TabPage RID_SVXPAGE_BACKGROUND }; MetricField MF_GRAPH_TRANS { + HelpID = "cui:MetricField:RID_SVXPAGE_BACKGROUND:MF_GRAPH_TRANS"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 168 ) ; Size = MAP_APPFONT ( 30 , 12) ; @@ -254,6 +264,7 @@ TabPage RID_SVXPAGE_BACKGROUND }; CheckBox BTN_PREVIEW { + HelpID = "cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW"; Pos = MAP_APPFONT ( 170 , 23 + 4 + 139 + RSC_SP_CTRL_GROUP_Y ) ; Size = MAP_APPFONT ( 141 , 10 ) ; Text [ en-US ] = "Pre~view" ; diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 48aac82fb..08e05d1ac 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -155,17 +155,6 @@ Color TpBorderRGBColor( ColorData aColorData ) } // ----------------------------------------------------------------------- - -Color TpBorderRGBColor( const Color& rColor ) -{ - Color aRGBColor( rColor.GetRed(), - rColor.GetGreen(), - rColor.GetBlue() ); - - return( aRGBColor ); -} - -// ----------------------------------------------------------------------- void lcl_SetDecimalDigitsTo1(MetricField& rField) { sal_Int64 nMin = rField.Denormalize( rField.GetMin( FUNIT_TWIP ) ); diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src index a2ad4d617..f96ac55c5 100644 --- a/cui/source/tabpages/border.src +++ b/cui/source/tabpages/border.src @@ -93,6 +93,7 @@ TabPage RID_SVXPAGE_BORDER }; ListBox LB_LINESTYLE { + HelpID = "cui:ListBox:RID_SVXPAGE_BORDER:LB_LINESTYLE"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 25 ) ; Size = MAP_APPFONT ( 74 , 66 ) ; @@ -105,6 +106,7 @@ TabPage RID_SVXPAGE_BORDER }; ListBox LB_LINECOLOR { + HelpID = "cui:ListBox:RID_SVXPAGE_BORDER:LB_LINECOLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 106 ) ; Size = MAP_APPFONT ( 74 , 68 ) ; @@ -125,6 +127,7 @@ TabPage RID_SVXPAGE_BORDER }; MetricField MF_LEFT { + HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:MF_LEFT"; Border = TRUE ; Pos = MAP_APPFONT ( 213 , 14 ) ; Size = MAP_APPFONT ( 38 , 12 ) ; @@ -146,6 +149,7 @@ TabPage RID_SVXPAGE_BORDER }; MetricField MF_RIGHT { + HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:MF_RIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 213 , 30 ) ; Size = MAP_APPFONT ( 38 , 12 ) ; @@ -167,6 +171,7 @@ TabPage RID_SVXPAGE_BORDER }; MetricField MF_TOP { + HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:MF_TOP"; Border = TRUE ; Pos = MAP_APPFONT ( 213 , 46 ) ; Size = MAP_APPFONT ( 38 , 12 ) ; @@ -188,6 +193,7 @@ TabPage RID_SVXPAGE_BORDER }; MetricField MF_BOTTOM { + HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:MF_BOTTOM"; Border = TRUE ; Pos = MAP_APPFONT ( 213 , 62 ) ; Size = MAP_APPFONT ( 38 , 12 ) ; @@ -203,6 +209,7 @@ TabPage RID_SVXPAGE_BORDER }; CheckBox CB_SYNC { + HelpID = "cui:CheckBox:RID_SVXPAGE_BORDER:CB_SYNC"; Pos = MAP_APPFONT ( 177 , 78 ) ; Size = MAP_APPFONT ( 74 , 10 ) ; Text [ en-US ] = "Synchronize"; @@ -236,6 +243,7 @@ TabPage RID_SVXPAGE_BORDER }; MetricField ED_SHADOWSIZE { + HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:ED_SHADOWSIZE"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 144 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -257,6 +265,7 @@ TabPage RID_SVXPAGE_BORDER }; ListBox LB_SHADOWCOLOR { + HelpID = "cui:ListBox:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 177 , 144 ) ; Size = MAP_APPFONT ( 74 , 68 ) ; @@ -278,6 +287,7 @@ TabPage RID_SVXPAGE_BORDER }; CheckBox CB_MERGEWITHNEXT { + HelpID = "cui:CheckBox:RID_SVXPAGE_BORDER:CB_MERGEWITHNEXT"; Pos = MAP_APPFONT ( 12 , 173 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Hide = TRUE; @@ -285,6 +295,7 @@ TabPage RID_SVXPAGE_BORDER }; CheckBox CB_MERGEADJACENTBORDERS { + HelpID = "cui:CheckBox:RID_SVXPAGE_BORDER:CB_MERGEADJACENTBORDERS"; Pos = MAP_APPFONT ( 12 , 173 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Hide = TRUE; diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index b25aef2f1..c56061927 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -283,13 +283,6 @@ sfx::ItemConnectionBase* CreateFrameLineConnection( USHORT nSlot, return new FrameLineConnection( nSlot, new FrameSelectorWrapper( rFrameSel, eBorder ), nFlags ); } -sfx::ItemConnectionBase* CreateFrameBoxConnection( USHORT /*nBoxSlot*/, USHORT /*nBoxInfoSlot*/, - FrameSelector& /*rFrameSel*/, FrameBorderType /*eBorder*/, sfx::ItemConnFlags /*nFlags*/ ) -{ - DBG_ERRORFILE( "svx::CreateFrameBoxConnection - not implemented" ); - return 0; -} - sfx::ItemConnectionBase* CreateMarginConnection( const SfxItemSet& rItemSet, MetricField& rMfLeft, MetricField& rMfRight, MetricField& rMfTop, MetricField& rMfBottom, diff --git a/cui/source/tabpages/borderconn.hxx b/cui/source/tabpages/borderconn.hxx index fa2d8e872..235840eec 100644 --- a/cui/source/tabpages/borderconn.hxx +++ b/cui/source/tabpages/borderconn.hxx @@ -48,13 +48,6 @@ sfx::ItemConnectionBase* CreateFrameLineConnection( USHORT nSlot, FrameSelector& rFrameSel, FrameBorderType eBorder, sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT ); -/** Creates an item connection object that connects an SvxBoxItem and an - SvxBoxInfoItem with an svx::FrameSelector control. */ -sfx::ItemConnectionBase* CreateFrameBoxConnection( - USHORT nBoxSlot, USHORT nBoxInfoSlot, - FrameSelector& rFrameSel, FrameBorderType eBorder, - sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT ); - /** Creates an item connection object that connects an SvxMarginItem with the controls of the SvxBorderTabPage. */ sfx::ItemConnectionBase* CreateMarginConnection( const SfxItemSet& rItemSet, diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 76d49acff..7a06dccb7 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1523,47 +1523,6 @@ void SvxCharNamePage::ResetColor_Impl( const SfxItemSet& rSet ) // ----------------------------------------------------------------------- -BOOL SvxCharNamePage::FillItemSetColor_Impl( SfxItemSet& rSet ) -{ - USHORT nWhich = GetWhich( SID_ATTR_CHAR_COLOR ); - const SvxColorItem* pOld = (const SvxColorItem*)GetOldItem( rSet, SID_ATTR_CHAR_COLOR ); - const SvxColorItem* pItem = NULL; - BOOL bChanged = TRUE; - const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL; - const SfxItemSet& rOldSet = GetItemSet(); - - Color aSelectedColor; - if ( m_pColorLB->GetSelectEntry() == m_pImpl->m_aTransparentText ) - aSelectedColor = Color( COL_TRANSPARENT ); - else - aSelectedColor = m_pColorLB->GetSelectEntryColor(); - - if ( pOld && pOld->GetValue() == aSelectedColor ) - bChanged = FALSE; - - if ( !bChanged ) - bChanged = ( m_pColorLB->GetSavedValue() == LISTBOX_ENTRY_NOTFOUND ); - - if ( !bChanged && pExampleSet && - pExampleSet->GetItemState( nWhich, FALSE, (const SfxPoolItem**)&pItem ) == SFX_ITEM_SET && - ( (SvxColorItem*)pItem )->GetValue() != aSelectedColor ) - bChanged = TRUE; - - BOOL bModified = FALSE; - - if ( bChanged && m_pColorLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) - { - rSet.Put( SvxColorItem( aSelectedColor, nWhich ) ); - bModified = TRUE; - } - else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) ) - CLEARTITEM; - - return bModified; -} - -// ----------------------------------------------------------------------- - IMPL_LINK( SvxCharNamePage, UpdateHdl_Impl, Timer*, EMPTYARG ) { UpdatePreview_Impl(); @@ -1656,7 +1615,6 @@ BOOL SvxCharNamePage::FillItemSet( SfxItemSet& rSet ) BOOL bModified = FillItemSet_Impl( rSet, Western ); bModified |= FillItemSet_Impl( rSet, Asian ); bModified |= FillItemSet_Impl( rSet, Ctl ); -//! bModified |= FillItemSetColor_Impl( rSet ); return bModified; } diff --git a/cui/source/tabpages/chardlg.src b/cui/source/tabpages/chardlg.src index 532a1bf89..9f268b9b1 100644 --- a/cui/source/tabpages/chardlg.src +++ b/cui/source/tabpages/chardlg.src @@ -58,6 +58,7 @@ TabPage RID_SVXPAGE_CHAR_NAME }; ComboBox LB_WEST_NAME { + HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME"; Border = TRUE; Pos = MAP_APPFONT ( 12 , 25 ); Size = MAP_APPFONT ( 80 , 72 ); @@ -66,6 +67,7 @@ TabPage RID_SVXPAGE_CHAR_NAME }; ComboBox LB_WEST_NAME_NOCJK { + HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME_NOCJK"; Border = TRUE; Pos = MAP_APPFONT ( 12 , 17 ); Size = MAP_APPFONT ( 112 , 71 ); @@ -86,6 +88,7 @@ TabPage RID_SVXPAGE_CHAR_NAME }; ComboBox LB_WEST_STYLE { + HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE"; Border = TRUE; Pos = MAP_APPFONT ( 96 , 25 ); Size = MAP_APPFONT ( 40 , 48 ); @@ -101,6 +104,7 @@ TabPage RID_SVXPAGE_CHAR_NAME }; ComboBox LB_WEST_STYLE_NOCJK { + HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE_NOCJK"; Border = TRUE; Pos = MAP_APPFONT ( 130 , 17 ); Size = MAP_APPFONT ( 72 , 71 ); @@ -128,6 +132,7 @@ TabPage RID_SVXPAGE_CHAR_NAME }; MetricBox LB_WEST_SIZE { + HelpID = "cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE"; Border = TRUE; Pos = MAP_APPFONT ( 140 , 25 ); Size = MAP_APPFONT ( 38 , 72 ); @@ -136,6 +141,7 @@ TabPage RID_SVXPAGE_CHAR_NAME }; MetricBox LB_WEST_SIZE_NOCJK { + HelpID = "cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE_NOCJK"; Border = TRUE; Pos = MAP_APPFONT ( 208 , 17 ); Size = MAP_APPFONT ( 40 , 71 ); @@ -156,6 +162,7 @@ TabPage RID_SVXPAGE_CHAR_NAME }; ListBox LB_WEST_LANG { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG"; Border = TRUE; Pos = MAP_APPFONT ( 182 , 25 ); Size = MAP_APPFONT ( 66 , 72 ); @@ -165,6 +172,7 @@ TabPage RID_SVXPAGE_CHAR_NAME }; ListBox LB_WEST_LANG_NOCJK { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG_NOCJK"; Border = TRUE; Pos = MAP_APPFONT ( 130 , 105 ); Size = MAP_APPFONT ( 72 , 72 ); @@ -186,6 +194,7 @@ TabPage RID_SVXPAGE_CHAR_NAME }; ComboBox LB_EAST_NAME { + HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_NAME"; Border = TRUE; Pos = MAP_APPFONT ( 12 , 65 ); Size = MAP_APPFONT ( 80 , 72 ); @@ -200,6 +209,7 @@ TabPage RID_SVXPAGE_CHAR_NAME }; ComboBox LB_EAST_STYLE { + HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_STYLE"; Border = TRUE; Pos = MAP_APPFONT ( 96 , 65 ); Size = MAP_APPFONT ( 40 , 48 ); @@ -221,6 +231,7 @@ TabPage RID_SVXPAGE_CHAR_NAME }; MetricBox LB_EAST_SIZE { + HelpID = "cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_SIZE"; Border = TRUE; Pos = MAP_APPFONT ( 140 , 65 ); Size = MAP_APPFONT ( 38 , 72 ); @@ -235,6 +246,7 @@ TabPage RID_SVXPAGE_CHAR_NAME }; ListBox LB_EAST_LANG { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_LANG"; Border = TRUE; Pos = MAP_APPFONT ( 182 , 65 ); Size = MAP_APPFONT ( 66 , 72 ); @@ -256,6 +268,7 @@ TabPage RID_SVXPAGE_CHAR_NAME }; ComboBox LB_CTL_NAME { + HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_NAME"; Border = TRUE; Pos = MAP_APPFONT ( 12 , 105 ); Size = MAP_APPFONT ( 80 , 72 ); @@ -270,6 +283,7 @@ TabPage RID_SVXPAGE_CHAR_NAME }; ComboBox LB_CTL_STYLE { + HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_STYLE"; Border = TRUE; Pos = MAP_APPFONT ( 96 , 105 ); Size = MAP_APPFONT ( 40 , 48 ); @@ -291,6 +305,7 @@ TabPage RID_SVXPAGE_CHAR_NAME }; MetricBox LB_CTL_SIZE { + HelpID = "cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_SIZE"; Border = TRUE; Pos = MAP_APPFONT ( 140 , 105 ); Size = MAP_APPFONT ( 38 , 72 ); @@ -305,6 +320,7 @@ TabPage RID_SVXPAGE_CHAR_NAME }; ListBox LB_CTL_LANG { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_LANG"; Border = TRUE; Pos = MAP_APPFONT ( 182 , 105 ); Size = MAP_APPFONT ( 66 , 72 ); @@ -339,6 +355,7 @@ TabPage RID_SVXPAGE_CHAR_NAME }; ListBox LB_COLOR2 { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_COLOR2"; Border = TRUE; Pos = MAP_APPFONT ( 12 , 105 ); Size = MAP_APPFONT ( 58 , 100 ); @@ -370,6 +387,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS }; ListBox LB_FONTCOLOR { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_FONTCOLOR"; Border = TRUE; Pos = MAP_APPFONT ( 10 , 15 ); Size = MAP_APPFONT ( 82 , 72 ); @@ -384,6 +402,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS }; ListBox LB_EFFECTS2 { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EFFECTS2"; Pos = MAP_APPFONT ( 10 , 44 ) ; Size = MAP_APPFONT ( 82 , 56 ) ; DropDown = TRUE; @@ -404,6 +423,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS }; ListBox LB_RELIEF { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_RELIEF"; Pos = MAP_APPFONT ( 10 , 73 ) ; Size = MAP_APPFONT ( 82 , 56 ) ; DropDown = TRUE; @@ -416,18 +436,21 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS }; TriStateBox CB_OUTLINE { + HelpID = "cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_OUTLINE"; Pos = MAP_APPFONT ( 10 , 93 ) ; Size = MAP_APPFONT ( 82 , 10 ) ; Text [ en-US ] = "Out~line" ; }; TriStateBox CB_SHADOW { + HelpID = "cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_SHADOW"; Pos = MAP_APPFONT ( 10 , 107 ) ; Size = MAP_APPFONT ( 82 , 10 ) ; Text [ en-US ] = "Sha~dow" ; }; TriStateBox CB_BLINKING { + HelpID = "cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_BLINKING"; Pos = MAP_APPFONT ( 10 , 121 ) ; Size = MAP_APPFONT ( 82 , 10 ) ; Hide = TRUE; @@ -435,6 +458,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS }; TriStateBox CB_CHARHIDDEN { + HelpID = "cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN"; Pos = MAP_APPFONT ( 10 , 135 ) ; Size = MAP_APPFONT ( 82 , 10 ) ; Text [ en-US ] = "H~idden" ; @@ -453,6 +477,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS }; ListBox LB_OVERLINE { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE"; Border = TRUE; Pos = MAP_APPFONT ( 110 , 15 ); Size = MAP_APPFONT ( 68 , 72 ); @@ -487,6 +512,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS }; ListBox LB_OVERLINE_COLOR { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE_COLOR"; Border = TRUE; Pos = MAP_APPFONT ( 184 , 15 ); Size = MAP_APPFONT ( 68 , 100 ); @@ -501,6 +527,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS }; ListBox LB_STRIKEOUT { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_STRIKEOUT"; Border = TRUE; Pos = MAP_APPFONT ( 110 , 44 ); Size = MAP_APPFONT ( 68 , 72 ); @@ -524,6 +551,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS }; ListBox LB_UNDERLINE { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE"; Border = TRUE; Pos = MAP_APPFONT ( 110 , 73 ); Size = MAP_APPFONT ( 68 , 72 ); @@ -558,6 +586,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS }; ListBox LB_UNDERLINE_COLOR { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE_COLOR"; Border = TRUE; Pos = MAP_APPFONT ( 184 , 73 ); Size = MAP_APPFONT ( 68 , 100 ); @@ -566,6 +595,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS }; CheckBox CB_INDIVIDUALWORDS { + HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_EFFECTS:CB_INDIVIDUALWORDS"; Pos = MAP_APPFONT ( 110 , 93 ); Size = MAP_APPFONT ( 68 , 10 ); TabStop = TRUE; @@ -584,6 +614,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS }; ListBox LB_EMPHASIS { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EMPHASIS"; Border = TRUE; Pos = MAP_APPFONT ( 110 , 128 ); Size = MAP_APPFONT ( 68 , 72 ); @@ -606,6 +637,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS }; ListBox LB_POSITION { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_POSITION"; Border = TRUE; Pos = MAP_APPFONT ( 184 , 128 ); Size = MAP_APPFONT ( 68 , 48 ); @@ -680,6 +712,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION }; RadioButton RB_HIGHPOS { + HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS"; Pos = MAP_APPFONT ( 12 , 16 ); Size = MAP_APPFONT ( 58 , 10 ); Text [ en-US ] = "Superscript" ; @@ -687,6 +720,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION }; RadioButton RB_NORMALPOS { + HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_NORMALPOS"; Pos = MAP_APPFONT ( 12 , 30 ); Size = MAP_APPFONT ( 58 , 10 ); Text [ en-US ] = "Normal" ; @@ -694,6 +728,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION }; RadioButton RB_LOWPOS { + HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_LOWPOS"; Pos = MAP_APPFONT ( 12 , 44 ); Size = MAP_APPFONT ( 58 , 10 ); Text [ en-US ] = "Subscript" ; @@ -707,6 +742,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION }; MetricField ED_HIGHLOW { + HelpID = "cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_HIGHLOW"; Border = TRUE; Pos = MAP_APPFONT ( 136 , 14 ); Size = MAP_APPFONT ( 30 , 12 ); @@ -723,6 +759,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION }; CheckBox CB_HIGHLOW { + HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_HIGHLOW"; Pos = MAP_APPFONT ( 172 , 16 ); Size = MAP_APPFONT ( 76 , 10 ); Text [ en-US ] = "A~utomatic" ; @@ -736,6 +773,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION }; MetricField ED_FONTSIZE { + HelpID = "cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_FONTSIZE"; Border = TRUE; Pos = MAP_APPFONT ( 136 , 30 ); Size = MAP_APPFONT ( 30 , 12 ); @@ -764,6 +802,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION }; RadioButton RB_0_DEG { + HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_0_DEG"; Pos = MAP_APPFONT ( 12 , 70 ); Size = MAP_APPFONT ( 46 , 10 ); TabStop = TRUE; @@ -771,6 +810,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION }; RadioButton RB_90_DEG { + HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_90_DEG"; Pos = MAP_APPFONT ( 62 , 70 ); Size = MAP_APPFONT ( 46 , 10 ); TabStop = TRUE; @@ -778,6 +818,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION }; RadioButton RB_270_DEG { + HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_270_DEG"; Pos = MAP_APPFONT ( 112 , 70 ); Size = MAP_APPFONT ( 46 , 10 ); TabStop = TRUE; @@ -785,6 +826,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION }; CheckBox CB_FIT_TO_LINE { + HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_FIT_TO_LINE"; Pos = MAP_APPFONT ( 162 , 70 ); Size = MAP_APPFONT ( 86 , 10 ); TabStop = TRUE; @@ -798,6 +840,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION }; MetricField MF_SCALE_WIDTH { + HelpID = "cui:MetricField:RID_SVXPAGE_CHAR_POSITION:MF_SCALE_WIDTH"; Border = TRUE; Pos = MAP_APPFONT ( 94 , 84 ); Size = MAP_APPFONT ( 30 , 12 ); @@ -820,6 +863,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION }; ListBox LB_KERNING2 { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_POSITION:LB_KERNING2"; Border = TRUE; Pos = MAP_APPFONT ( 12 , 111 ); Size = MAP_APPFONT ( 72 , 48 ) ; @@ -840,6 +884,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION }; MetricField ED_KERNING2 { + HelpID = "cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_KERNING2"; Border = TRUE; Pos = MAP_APPFONT ( 112 , 111 ); Size = MAP_APPFONT ( 40 , 12 ); @@ -853,6 +898,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION }; CheckBox CB_PAIRKERNING { + HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_PAIRKERNING"; Pos = MAP_APPFONT ( 156 , 113 ); Size = MAP_APPFONT ( 92 , 10 ); Text [ en-US ] = "~Pair kerning" ; @@ -887,6 +933,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES }; CheckBox CB_TWOLINES { + HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_TWOLINES:CB_TWOLINES"; Pos = MAP_APPFONT ( 12 , 14 ); Size = MAP_APPFONT ( 236 , 10 ); Text [ en-US ] = "~Write in double lines" ; @@ -906,6 +953,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES }; ListBox ED_STARTBRACKET { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_STARTBRACKET"; Pos = MAP_APPFONT ( 12 , 52 ); Size = MAP_APPFONT ( 90 , 72 ); TabStop = TRUE; @@ -928,6 +976,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES }; ListBox ED_ENDBRACKET { + HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_ENDBRACKET"; Pos = MAP_APPFONT ( 108 , 52 ); Size = MAP_APPFONT ( 90 , 72 ); TabStop = TRUE; diff --git a/cui/source/tabpages/connect.src b/cui/source/tabpages/connect.src index a52e893e6..3031be2c5 100644 --- a/cui/source/tabpages/connect.src +++ b/cui/source/tabpages/connect.src @@ -49,6 +49,7 @@ TabPage RID_SVXPAGE_CONNECTION }; ListBox LB_TYPE { + HelpID = "cui:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE"; Border = TRUE ; Pos = MAP_APPFONT ( 37 , 6 ) ; Size = MAP_APPFONT ( 83 , 54 ) ; @@ -69,6 +70,7 @@ TabPage RID_SVXPAGE_CONNECTION }; MetricField MTR_FLD_LINE_1 { + HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1"; Border = TRUE ; Pos = MAP_APPFONT ( 79 , 35 ) ; Size = MAP_APPFONT ( 41 , 12 ) ; @@ -91,6 +93,7 @@ TabPage RID_SVXPAGE_CONNECTION }; MetricField MTR_FLD_LINE_2 { + HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2"; Border = TRUE ; Pos = MAP_APPFONT ( 79 , 51 ) ; Size = MAP_APPFONT ( 41 , 12 ) ; @@ -113,6 +116,7 @@ TabPage RID_SVXPAGE_CONNECTION }; MetricField MTR_FLD_LINE_3 { + HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3"; Border = TRUE ; Pos = MAP_APPFONT ( 79 , 67 ) ; Size = MAP_APPFONT ( 41 , 12 ) ; @@ -141,6 +145,7 @@ TabPage RID_SVXPAGE_CONNECTION }; MetricField MTR_FLD_HORZ_1 { + HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1"; Border = TRUE ; Pos = MAP_APPFONT ( 79 , 96 ) ; Size = MAP_APPFONT ( 41 , 12 ) ; @@ -163,6 +168,7 @@ TabPage RID_SVXPAGE_CONNECTION }; MetricField MTR_FLD_HORZ_2 { + HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2"; Border = TRUE ; Pos = MAP_APPFONT ( 79 , 128 ) ; Size = MAP_APPFONT ( 41 , 12 ) ; @@ -185,6 +191,7 @@ TabPage RID_SVXPAGE_CONNECTION }; MetricField MTR_FLD_VERT_1 { + HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1"; Border = TRUE ; Pos = MAP_APPFONT ( 79 , 112 ) ; Size = MAP_APPFONT ( 41 , 12 ) ; @@ -207,6 +214,7 @@ TabPage RID_SVXPAGE_CONNECTION }; MetricField MTR_FLD_VERT_2 { + HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2"; Border = TRUE ; Pos = MAP_APPFONT ( 79 , 144 ) ; Size = MAP_APPFONT ( 41 , 12 ) ; diff --git a/cui/source/tabpages/dstribut.src b/cui/source/tabpages/dstribut.src index 667d12ab8..96448491d 100644 --- a/cui/source/tabpages/dstribut.src +++ b/cui/source/tabpages/dstribut.src @@ -49,6 +49,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE RadioButton BTN_HOR_NONE { + HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 48 , 10 ) ; Text [ en-US ] = "~None" ; @@ -56,6 +57,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE RadioButton BTN_HOR_LEFT { + HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT"; Pos = MAP_APPFONT ( 56 , 26 ) ; Size = MAP_APPFONT ( 45 , 10 ) ; Text [ en-US ] = "~Left" ; @@ -63,6 +65,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE RadioButton BTN_HOR_CENTER { + HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER"; Pos = MAP_APPFONT ( 105 , 26 ) ; Size = MAP_APPFONT ( 45 , 10 ) ; Text [ en-US ] = "~Center" ; @@ -70,6 +73,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE RadioButton BTN_HOR_DISTANCE { + HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE"; Pos = MAP_APPFONT ( 154 , 26 ) ; Size = MAP_APPFONT ( 45 , 10 ) ; Text [ en-US ] = "~Spacing" ; @@ -77,6 +81,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE RadioButton BTN_HOR_RIGHT { + HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT"; Pos = MAP_APPFONT ( 203 , 26 ) ; Size = MAP_APPFONT ( 45 , 10 ) ; Text [ en-US ] = "~Right" ; @@ -131,6 +136,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE RadioButton BTN_VER_NONE { + HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE"; Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 46 , 10 ) ; Text [ en-US ] = "N~one" ; @@ -138,6 +144,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE RadioButton BTN_VER_TOP { + HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP"; Pos = MAP_APPFONT ( 56 , 65 ) ; Size = MAP_APPFONT ( 45 , 10 ) ; Text [ en-US ] = "~Top" ; @@ -145,6 +152,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE RadioButton BTN_VER_CENTER { + HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER"; Pos = MAP_APPFONT ( 105 , 65 ) ; Size = MAP_APPFONT ( 45 , 10 ) ; Text [ en-US ] = "C~enter" ; @@ -152,6 +160,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE RadioButton BTN_VER_DISTANCE { + HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE"; Pos = MAP_APPFONT ( 154 , 65 ) ; Size = MAP_APPFONT ( 45 , 10 ) ; Text [ en-US ] = "S~pacing" ; @@ -159,6 +168,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE RadioButton BTN_VER_BOTTOM { + HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM"; Pos = MAP_APPFONT ( 203 , 65 ) ; Size = MAP_APPFONT ( 45 , 10 ) ; Text [ en-US ] = "~Bottom" ; diff --git a/cui/source/tabpages/grfpage.src b/cui/source/tabpages/grfpage.src index 863f8787d..a6733903f 100644 --- a/cui/source/tabpages/grfpage.src +++ b/cui/source/tabpages/grfpage.src @@ -58,6 +58,7 @@ TabPage RID_SVXPAGE_GRFCROP }; MetricField MF_LEFT { + HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_LEFT"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 42 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -83,6 +84,7 @@ TabPage RID_SVXPAGE_GRFCROP }; MetricField MF_RIGHT { + HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_RIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 58 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -106,6 +108,7 @@ TabPage RID_SVXPAGE_GRFCROP }; MetricField MF_TOP { + HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_TOP"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 42 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -131,6 +134,7 @@ TabPage RID_SVXPAGE_GRFCROP }; MetricField MF_BOTTOM { + HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_BOTTOM"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 58 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -148,12 +152,14 @@ TabPage RID_SVXPAGE_GRFCROP }; RadioButton RB_SIZECONST { + HelpID = "cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_SIZECONST"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "Keep image si~ze" ; }; RadioButton RB_ZOOMCONST { + HelpID = "cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_ZOOMCONST"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Check = TRUE ; @@ -180,6 +186,7 @@ TabPage RID_SVXPAGE_GRFCROP }; MetricField MF_WIDTHZOOM { + HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTHZOOM"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 87 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -207,6 +214,7 @@ TabPage RID_SVXPAGE_GRFCROP }; MetricField MF_HEIGHTZOOM { + HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHTZOOM"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 103 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -239,6 +247,7 @@ TabPage RID_SVXPAGE_GRFCROP }; MetricField MF_WIDTH { + HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 132 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -264,6 +273,7 @@ TabPage RID_SVXPAGE_GRFCROP }; MetricField MF_HEIGHT { + HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 148 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -286,6 +296,7 @@ TabPage RID_SVXPAGE_GRFCROP }; PushButton PB_ORGSIZE { + HelpID = "cui:PushButton:RID_SVXPAGE_GRFCROP:PB_ORGSIZE"; Pos = MAP_APPFONT ( 176 , 143 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src index 45e8aa370..0df6d968b 100644 --- a/cui/source/tabpages/labdlg.src +++ b/cui/source/tabpages/labdlg.src @@ -53,6 +53,7 @@ TabPage RID_SVXPAGE_CAPTION }; MetricField MF_ABSTAND { + HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_ABSTAND"; Border = TRUE ; Pos = MAP_APPFONT ( 50 , 51 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -73,6 +74,7 @@ TabPage RID_SVXPAGE_CAPTION }; ListBox LB_WINKEL { + HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_WINKEL"; Border = TRUE ; Pos = MAP_APPFONT ( 143 , 51 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; @@ -96,6 +98,7 @@ TabPage RID_SVXPAGE_CAPTION }; ListBox LB_ANSATZ { + HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ"; Border = TRUE ; Pos = MAP_APPFONT ( 50 , 67 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; @@ -119,6 +122,7 @@ TabPage RID_SVXPAGE_CAPTION }; MetricField MF_ANSATZ { + HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_ANSATZ"; Border = TRUE ; Pos = MAP_APPFONT ( 143 , 67 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -139,6 +143,7 @@ TabPage RID_SVXPAGE_CAPTION }; ListBox LB_ANSATZ_REL { + HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL"; Border = TRUE ; Pos = MAP_APPFONT ( 143 , 67 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; @@ -155,6 +160,7 @@ TabPage RID_SVXPAGE_CAPTION }; MetricField MF_LAENGE { + HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_LAENGE"; Border = TRUE ; Pos = MAP_APPFONT ( 50 , 83 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -169,6 +175,7 @@ TabPage RID_SVXPAGE_CAPTION }; CheckBox CB_LAENGE { + HelpID = "cui:CheckBox:RID_SVXPAGE_CAPTION:CB_LAENGE"; Pos = MAP_APPFONT ( 106 , 84 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; TabStop = TRUE ; diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 345bbd0cd..68242aeff 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -237,26 +237,6 @@ void _SfxMacroTabPage::ScriptChanged( const String& aLangName ) EnableButtons( aLangName ); } -void _SfxMacroTabPage::SetGetRangeLink( FNGetRangeHdl pFn ) -{ - mpImpl->fnGetRange = pFn; -} - -FNGetRangeHdl _SfxMacroTabPage::GetGetRangeLink() const -{ - return mpImpl->fnGetRange; -} - -void _SfxMacroTabPage::SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn ) -{ - mpImpl->fnGetMacroOfRange = pFn; -} - -FNGetMacrosOfRangeHdl _SfxMacroTabPage::GetGetMacrosOfRangeLink() const -{ - return mpImpl->fnGetMacroOfRange; -} - BOOL _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet ) { SvxMacroItem aItem( GetWhich( aPageRg[0] ) ); @@ -313,11 +293,6 @@ void _SfxMacroTabPage::Reset( const SfxItemSet& rSet ) rListBox.SetCurEntry( pE ); } -void _SfxMacroTabPage::SetReadOnly( BOOL bSet ) -{ - mpImpl->bReadOnly = bSet; -} - BOOL _SfxMacroTabPage::IsReadOnly() const { return mpImpl->bReadOnly; @@ -392,12 +367,6 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, EMPTYARG ) return 0; } -IMPL_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit*, EMPTYARG ) -{ - pThis->EnableButtons( DEFINE_CONST_UNICODE("JavaScript") ); - return 0; -} - IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) { _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; @@ -580,24 +549,6 @@ void _SfxMacroTabPage::FillEvents() } } -void _SfxMacroTabPage::SelectEvent( const String & /*rEventName*/, USHORT nEventId ) -{ - SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); - ULONG nEntryCnt = rListBox.GetEntryCount(); - - for( ULONG n = 0 ; n < nEntryCnt ; ++n ) - { - SvLBoxEntry* pE = rListBox.GetEntry( n ); - if( pE && ( USHORT ) ( ULONG ) pE->GetUserData() == nEventId ) - { - rListBox.SetCurEntry( pE ); - rListBox.MakeVisible( pE ); - break; - } - } -} - - SvStringsDtor* __EXPORT _ImpGetRangeHdl( _SfxMacroTabPage* /*pTbPg*/, const String& rLanguage ) { SvStringsDtor* pNew = new SvStringsDtor; diff --git a/cui/source/tabpages/macroass.src b/cui/source/tabpages/macroass.src index c64aac6c1..d97aa813d 100644 --- a/cui/source/tabpages/macroass.src +++ b/cui/source/tabpages/macroass.src @@ -32,6 +32,7 @@ TabPage RID_SVXPAGE_EVENTASSIGN { + HelpID = "cui:TabPage:RID_SVXPAGE_EVENTASSIGN"; Hide = TRUE ; SVLook = TRUE ; DialogControl = TRUE ; @@ -89,6 +90,7 @@ TabPage RID_SVXPAGE_EVENTASSIGN }; PushButton PB_ASSIGN { + HelpID = "cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN"; Pos = MAP_APPFONT ( COL4 , ROW0 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; // ### ACHTUNG: Neuer Text in Resource? Z~uweisen : Zuweisen @@ -98,6 +100,7 @@ TabPage RID_SVXPAGE_EVENTASSIGN }; PushButton PB_DELETE { + HelpID = "cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE"; Pos = MAP_APPFONT ( COL4 , ROW2 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; Disable = TRUE ; @@ -106,6 +109,7 @@ TabPage RID_SVXPAGE_EVENTASSIGN }; ListBox LB_SCRIPTTYPE { + HelpID = "cui:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE"; Pos = MAP_APPFONT ( COL4 , ROW4 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , 60 ) ; // en-US was missing diff --git a/cui/source/tabpages/measure.src b/cui/source/tabpages/measure.src index bec495036..52bf76a58 100644 --- a/cui/source/tabpages/measure.src +++ b/cui/source/tabpages/measure.src @@ -55,6 +55,7 @@ TabPage RID_SVXPAGE_MEASURE }; MetricField MTR_LINE_DIST { + HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST"; Border = TRUE ; Pos = MAP_APPFONT ( 78 , 14 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; @@ -77,6 +78,7 @@ TabPage RID_SVXPAGE_MEASURE }; MetricField MTR_FLD_HELPLINE_OVERHANG { + HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG"; Border = TRUE ; Pos = MAP_APPFONT ( 78 , 30 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; @@ -99,6 +101,7 @@ TabPage RID_SVXPAGE_MEASURE }; MetricField MTR_FLD_HELPLINE_DIST { + HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST"; Border = TRUE ; Pos = MAP_APPFONT ( 78 , 46 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; @@ -121,6 +124,7 @@ TabPage RID_SVXPAGE_MEASURE }; MetricField MTR_FLD_HELPLINE1_LEN { + HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN"; Border = TRUE ; Pos = MAP_APPFONT ( 78 , 62 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; @@ -143,6 +147,7 @@ TabPage RID_SVXPAGE_MEASURE }; MetricField MTR_FLD_HELPLINE2_LEN { + HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN"; Border = TRUE ; Pos = MAP_APPFONT ( 78 , 78 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; @@ -159,6 +164,7 @@ TabPage RID_SVXPAGE_MEASURE }; TriStateBox TSB_BELOW_REF_EDGE { + HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE"; Pos = MAP_APPFONT ( 12 , 96 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; TabStop = TRUE ; @@ -173,6 +179,7 @@ TabPage RID_SVXPAGE_MEASURE }; MetricField MTR_FLD_DECIMALPLACES { + HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_DECIMALPLACES"; Border = TRUE ; Pos = MAP_APPFONT ( 78 , 110 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; @@ -213,6 +220,7 @@ TabPage RID_SVXPAGE_MEASURE }; TriStateBox TSB_AUTOPOSV { + HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV"; Pos = MAP_APPFONT ( 154 , 54 ) ; Size = MAP_APPFONT ( 101 , 10 ) ; TabStop = TRUE ; @@ -220,6 +228,7 @@ TabPage RID_SVXPAGE_MEASURE }; TriStateBox TSB_AUTOPOSH { + HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH"; Pos = MAP_APPFONT ( 154 , 68 ) ; Size = MAP_APPFONT ( 101 , 10 ) ; TabStop = TRUE ; @@ -227,6 +236,7 @@ TabPage RID_SVXPAGE_MEASURE }; TriStateBox TSB_PARALLEL { + HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL"; Pos = MAP_APPFONT ( 138 , 82 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; TabStop = TRUE ; @@ -234,6 +244,7 @@ TabPage RID_SVXPAGE_MEASURE }; TriStateBox TSB_SHOW_UNIT { + HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT"; Pos = MAP_APPFONT ( 138 , 96 ) ; Size = MAP_APPFONT ( 64+40 , 10 ) ; TabStop = TRUE ; @@ -241,6 +252,7 @@ TabPage RID_SVXPAGE_MEASURE }; ListBox LB_UNIT { + HelpID = "cui:ListBox:RID_SVXPAGE_MEASURE:LB_UNIT"; Border = TRUE ; Pos = MAP_APPFONT ( 154 , 110 ) ; Size = MAP_APPFONT ( 60 , 80+35 ) ; diff --git a/cui/source/tabpages/numfmt.src b/cui/source/tabpages/numfmt.src index 78074755e..4441159d0 100644 --- a/cui/source/tabpages/numfmt.src +++ b/cui/source/tabpages/numfmt.src @@ -45,6 +45,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT }; ListBox LB_CATEGORY { + HelpID = "cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 70 , 71 ) ; @@ -72,6 +73,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT }; Edit ED_FORMAT { + HelpID = "cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 147 ) ; Size = MAP_APPFONT ( 200 , 12 ) ; @@ -85,6 +87,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT }; Edit ED_COMMENT { + HelpID = "cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT"; Hide = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 163 ) ; @@ -99,6 +102,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT ListBox LB_CURRENCY { + HelpID = "cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY"; Border = TRUE ; Pos = MAP_APPFONT ( 82 , 14 ) ; Size = MAP_APPFONT ( 90 , 71 ) ; @@ -127,6 +131,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT }; NumericField ED_DECIMALS { + HelpID = "cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS"; Border = TRUE ; Pos = MAP_APPFONT ( 84 , 102 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; @@ -147,6 +152,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT }; NumericField ED_LEADZEROES { + HelpID = "cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES"; Border = TRUE ; Pos = MAP_APPFONT ( 84 , 118 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; @@ -160,12 +166,14 @@ TabPage RID_SVXPAGE_NUMBERFORMAT }; CheckBox BTN_NEGRED { + HelpID = "cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED"; Pos = MAP_APPFONT ( 133 , 104 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "~Negative numbers red" ; }; CheckBox BTN_THOUSAND { + HelpID = "cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND"; Pos = MAP_APPFONT ( 133 , 120 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "~Thousands separator" ; @@ -184,6 +192,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT }; ListBox LB_LANGUAGE { + HelpID = "cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE"; Border = TRUE ; Sort = TRUE ; Pos = MAP_APPFONT ( 178 , 14 ) ; @@ -192,6 +201,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT }; CheckBox CB_SOURCEFORMAT { + HelpID = "cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT"; Pos = MAP_APPFONT ( 178 , 42 ) ; Size = MAP_APPFONT ( 76 , 10 ) ; Text [ en-US ] = "So~urce format" ; diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 368859a5a..234d9edd6 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -939,28 +939,6 @@ void SvxNumPickTabPage::PageCreated(SfxAllItemSet aSet) SetCharFmtNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue()); } //end of CHINA001 -/*-----------------07.02.97 15.59------------------- - ---------------------------------------------------*/ -void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType, - const OUString& rBulletChar, const OUString& rText, const OUString& rFontName, - Point& rLeft, Font& rRuleFont, const Font& rTextFont) -{ - - if(NumberingType::CHAR_SPECIAL == nNumberingType ) - { - rRuleFont.SetStyleName(rFontName); - pVDev->SetFont(rRuleFont); - pVDev->DrawText(rLeft, rBulletChar); - rLeft.X() += pVDev->GetTextWidth(rBulletChar); - } - else - { - pVDev->SetFont(rTextFont); - pVDev->DrawText(rLeft, rText); - rLeft.X() += pVDev->GetTextWidth(rText); - } -} /**************************************************************************/ /* */ @@ -2269,7 +2247,6 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton ) Size aSize; sal_Bool bSucc(sal_False); SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) ); -// aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE ); if(MN_GALLERY_ENTRY <= nItemId ) { diff --git a/cui/source/tabpages/numpages.src b/cui/source/tabpages/numpages.src index 761377142..3e2576e4c 100644 --- a/cui/source/tabpages/numpages.src +++ b/cui/source/tabpages/numpages.src @@ -128,6 +128,7 @@ TabPage RID_SVXPAGE_PICK_BMP }; CheckBox CB_LINKED { + HelpID = "cui:CheckBox:RID_SVXPAGE_PICK_BMP:CB_LINKED"; Pos = MAP_APPFONT ( 9 , 169 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; @@ -161,6 +162,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; MultiListBox LB_LEVEL { + HelpID = "cui:MultiListBox:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL"; Pos = MAP_APPFONT ( 12 , 25 ) ; Size = MAP_APPFONT ( 26 , 154 ) ; TabStop = TRUE ; @@ -182,6 +184,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; ListBox LB_FMT { + HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_FMT"; Pos = MAP_APPFONT ( 103 , 25 ) ; Size = MAP_APPFONT ( 67 , 72 ) ; TabStop = TRUE ; @@ -225,6 +228,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; Edit ED_PREFIX { + HelpID = "cui:Edit:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX"; Border = TRUE ; Pos = MAP_APPFONT ( 103 , 41 ) ; Size = MAP_APPFONT ( 67 , 12 ) ; @@ -241,6 +245,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; Edit ED_SUFFIX { + HelpID = "cui:Edit:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX"; Border = TRUE ; Pos = MAP_APPFONT ( 103 , 57 ) ; Size = MAP_APPFONT ( 67 , 12 ) ; @@ -256,6 +261,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; ListBox LB_CHARFMT { + HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT"; TabStop = TRUE ; DropDown = TRUE ; Pos = MAP_APPFONT ( 103 , 73 ) ; @@ -270,6 +276,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; ListBox LB_BUL_COLOR { + HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_BUL_COLOR"; TabStop = TRUE ; DropDown = TRUE ; Pos = MAP_APPFONT ( 103 , 73 ) ; @@ -285,6 +292,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; MetricField MF_BUL_REL_SIZE { + HelpID = "cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_BUL_REL_SIZE"; Pos = MAP_APPFONT ( 103 , 89 ) ; Size = MAP_APPFONT ( 67 , 12 ) ; Border = TRUE ; @@ -307,6 +315,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; NumericField NF_ALL_LEVEL { + HelpID = "cui:NumericField:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL"; Border = TRUE ; Pos = MAP_APPFONT ( 103 , 89 ) ; Size = MAP_APPFONT ( 67 , 12 ) ; @@ -329,6 +338,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; NumericField ED_START { + HelpID = "cui:NumericField:RID_SVXPAGE_NUM_OPTIONS:ED_START"; Border = TRUE ; Pos = MAP_APPFONT ( 103 , 105 ) ; Size = MAP_APPFONT ( 67 , 12 ) ; @@ -351,6 +361,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; ListBox LB_ALIGN { + HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_ALIGN"; Pos = MAP_APPFONT ( 103 , 133 ) ; Size = MAP_APPFONT ( 40 , 40 ) ; TabStop = TRUE ; @@ -369,6 +380,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; PushButton PB_BULLET { + HelpID = "cui:PushButton:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET"; Hide = TRUE ; Pos = MAP_APPFONT ( 103 , 105 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; @@ -384,6 +396,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; MenuButton MB_BITMAP { + HelpID = "cui:MenuButton:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP"; Hide = TRUE ; Pos = MAP_APPFONT ( 103 , 41 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; @@ -416,6 +429,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; MetricField MF_WIDTH { + HelpID = "cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH"; Pos = MAP_APPFONT ( 103 , 59 ) ; Size = MAP_APPFONT ( 67 , 12 ) ; Border = TRUE ; @@ -442,6 +456,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; MetricField MF_HEIGHT { + HelpID = "cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT"; Pos = MAP_APPFONT ( 103 , 75 ) ; Size = MAP_APPFONT ( 67 , 12 ) ; Border = TRUE ; @@ -461,6 +476,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; CheckBox CB_RATIO { + HelpID = "cui:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO"; Hide = TRUE ; Pos = MAP_APPFONT ( 50 , 91 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; @@ -475,6 +491,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; ListBox LB_ORIENT { + HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT"; Hide = TRUE ; Pos = MAP_APPFONT ( 103 , 103 ) ; Size = MAP_APPFONT ( 67 , 72 ) ; @@ -502,6 +519,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; CheckBox CB_SAME_LEVEL { + HelpID = "cui:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL"; Pos = MAP_APPFONT ( 53 , 167 ) ; Size = MAP_APPFONT ( 114 , 10 ) ; Text [ en-US ] = "~Consecutive numbering" ; @@ -537,6 +555,7 @@ TabPage RID_SVXPAGE_NUM_POSITION }; MultiListBox LB_LEVEL { + HelpID = "cui:MultiListBox:RID_SVXPAGE_NUM_POSITION:LB_LEVEL"; Pos = MAP_APPFONT ( 12 , 25 ) ; Size = MAP_APPFONT ( 26 , 154 ) ; TabStop = TRUE ; @@ -559,6 +578,7 @@ TabPage RID_SVXPAGE_NUM_POSITION }; MetricField MF_BORDERDIST { + HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_BORDERDIST"; Pos = MAP_APPFONT ( 198 , 25 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Border = TRUE ; @@ -577,6 +597,7 @@ TabPage RID_SVXPAGE_NUM_POSITION }; CheckBox CB_RELATIVE { + HelpID = "cui:CheckBox:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE"; Pos = MAP_APPFONT ( 198 , 41 ) ; Size = MAP_APPFONT ( 52 , 10 ) ; Text [ en-US ] = "Relati~ve" ; @@ -589,6 +610,7 @@ TabPage RID_SVXPAGE_NUM_POSITION }; MetricField MF_INDENT { + HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT"; Pos = MAP_APPFONT ( 198 , 57 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Border = TRUE ; @@ -613,6 +635,7 @@ TabPage RID_SVXPAGE_NUM_POSITION }; MetricField MF_NUMDIST { + HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST"; Pos = MAP_APPFONT ( 198 , 73 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; @@ -637,6 +660,7 @@ TabPage RID_SVXPAGE_NUM_POSITION }; ListBox LB_ALIGN { + HelpID = "cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN"; Pos = MAP_APPFONT ( 198 , 89 ) ; Size = MAP_APPFONT ( 40 , 40 ) ; TabStop = TRUE ; @@ -656,6 +680,7 @@ TabPage RID_SVXPAGE_NUM_POSITION }; ListBox LB_LABEL_FOLLOWED_BY { + HelpID = "cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_LABEL_FOLLOWED_BY"; Pos = MAP_APPFONT ( 198 , 25 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; TabStop = TRUE ; @@ -676,6 +701,7 @@ TabPage RID_SVXPAGE_NUM_POSITION }; MetricField MF_LISTTAB { + HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_LISTTAB"; Pos = MAP_APPFONT ( 198 , 41 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Border = TRUE ; @@ -699,6 +725,7 @@ TabPage RID_SVXPAGE_NUM_POSITION }; ListBox LB_ALIGN_2 { + HelpID = "cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN_2"; Pos = MAP_APPFONT ( 198 , 57 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; TabStop = TRUE ; @@ -712,6 +739,7 @@ TabPage RID_SVXPAGE_NUM_POSITION }; MetricField MF_ALIGNED_AT { + HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_ALIGNED_AT"; Pos = MAP_APPFONT ( 198 , 73 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; @@ -736,6 +764,7 @@ TabPage RID_SVXPAGE_NUM_POSITION }; MetricField MF_INDENT_AT { + HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT_AT"; Pos = MAP_APPFONT ( 198 , 89 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; @@ -754,6 +783,7 @@ TabPage RID_SVXPAGE_NUM_POSITION }; PushButton PB_STANDARD { + HelpID = "cui:PushButton:RID_SVXPAGE_NUM_POSITION:PB_STANDARD"; Pos = MAP_APPFONT ( 198 , 165 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Default" ; diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src index 35c06cce5..5e174f3e1 100644 --- a/cui/source/tabpages/page.src +++ b/cui/source/tabpages/page.src @@ -54,6 +54,7 @@ TabPage RID_SVXPAGE_PAGE }; ListBox LB_PAPER_SIZE { + HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE"; Pos = MAP_APPFONT ( 50 , 14 ) ; Size = MAP_APPFONT ( 50 , 64 ) ; DropDown = TRUE ; @@ -68,6 +69,7 @@ TabPage RID_SVXPAGE_PAGE }; MetricField ED_PAPER_WIDTH { + HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 50, 30 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -89,6 +91,7 @@ TabPage RID_SVXPAGE_PAGE }; MetricField ED_PAPER_HEIGHT { + HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 50 , 46 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -109,6 +112,7 @@ TabPage RID_SVXPAGE_PAGE }; RadioButton RB_PORTRAIT { + HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT"; Pos = MAP_APPFONT ( 50 , 62 ) ; Size = MAP_APPFONT ( 53 , 10 ) ; Check = TRUE ; @@ -116,6 +120,7 @@ TabPage RID_SVXPAGE_PAGE }; RadioButton RB_LANDSCAPE { + HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE"; Pos = MAP_APPFONT ( 50 , 74 ) ; Size = MAP_APPFONT ( 53 , 10 ) ; Text [ en-US ] = "L~andscape"; @@ -136,6 +141,7 @@ TabPage RID_SVXPAGE_PAGE }; ListBox LB_TEXT_FLOW { + HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_TEXT_FLOW"; Border = TRUE ; Pos = MAP_APPFONT ( 165 , 58 ) ; Size = MAP_APPFONT ( 83 , 50 ) ; @@ -152,6 +158,7 @@ TabPage RID_SVXPAGE_PAGE }; ListBox LB_PAPER_TRAY { + HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_TRAY"; Pos = MAP_APPFONT ( 165 , 72 ) ; Size = MAP_APPFONT ( 83 , 50 ) ; DropDown = TRUE ; @@ -172,6 +179,7 @@ TabPage RID_SVXPAGE_PAGE }; MetricField ED_LEFT_MARGIN { + HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 55 , 101 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -193,6 +201,7 @@ TabPage RID_SVXPAGE_PAGE }; MetricField ED_RIGHT_MARGIN { + HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 55 , 117 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -214,6 +223,7 @@ TabPage RID_SVXPAGE_PAGE }; MetricField ED_TOP_MARGIN { + HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_TOP_MARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 55 , 133 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -235,6 +245,7 @@ TabPage RID_SVXPAGE_PAGE }; MetricField ED_BOTTOM_MARGIN { + HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 55 , 149 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -267,6 +278,7 @@ TabPage RID_SVXPAGE_PAGE }; ListBox LB_LAYOUT { + HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_LAYOUT"; Border = TRUE ; Pos = MAP_APPFONT ( 170, 101 ) ; Size = MAP_APPFONT ( 78 , 44 ) ; @@ -287,6 +299,7 @@ TabPage RID_SVXPAGE_PAGE }; ListBox LB_NUMBER_FORMAT { + HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 117 ) ; Size = MAP_APPFONT ( 78 , 64 ) ; @@ -310,6 +323,7 @@ TabPage RID_SVXPAGE_PAGE }; CheckBox CB_HORZ { + HelpID = "cui:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ"; Hide = TRUE ; Pos = MAP_APPFONT ( 175 , 133 ) ; Size = MAP_APPFONT ( 73 , 10 ) ; @@ -317,6 +331,7 @@ TabPage RID_SVXPAGE_PAGE }; CheckBox CB_VERT { + HelpID = "cui:CheckBox:RID_SVXPAGE_PAGE:CB_VERT"; Hide = TRUE ; Pos = MAP_APPFONT ( 175 , 147 ) ; Size = MAP_APPFONT ( 73 , 10 ) ; @@ -324,6 +339,7 @@ TabPage RID_SVXPAGE_PAGE }; CheckBox CB_ADAPT { + HelpID = "cui:CheckBox:RID_SVXPAGE_PAGE:CB_ADAPT"; Hide = TRUE ; Pos = MAP_APPFONT ( 113 , 133 ) ; Size = MAP_APPFONT ( 135 , 10 ) ; @@ -332,6 +348,7 @@ TabPage RID_SVXPAGE_PAGE /* Registerhaltigkeit (fuer SW) */ CheckBox CB_REGISTER { + HelpID = "cui:CheckBox:RID_SVXPAGE_PAGE:CB_REGISTER"; Pos = MAP_APPFONT ( 113 , 133 ) ; Size = MAP_APPFONT ( 135 , 10 ) ; Hide = TRUE ; @@ -346,6 +363,7 @@ TabPage RID_SVXPAGE_PAGE }; ListBox LB_REGISTER { + HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_REGISTER"; Pos = MAP_APPFONT ( 122 , 157 ) ; Size = MAP_APPFONT ( 126 , 50 ) ; DropDown = TRUE ; diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index d500078e8..c1e5471fc 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -957,13 +957,6 @@ void SvxStdParagraphTabPage::SetPageWidth( USHORT nPageWidth ) { nWidth = nPageWidth; } -/*-----------------16.01.97 18.01------------------- - ---------------------------------------------------*/ -void SvxStdParagraphTabPage::SetMaxDistance( USHORT nMaxDist ) -{ - nAbst = nMaxDist; -} /*-----------------17.01.97 08.11------------------- diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src index 9b06d2612..38bae1971 100644 --- a/cui/source/tabpages/paragrph.src +++ b/cui/source/tabpages/paragrph.src @@ -46,6 +46,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH }; MetricField ED_LEFTINDENT { + HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT"; Border = TRUE ; Pos = MAP_APPFONT ( 135 , 14 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -68,6 +69,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH }; MetricField ED_RIGHTINDENT { + HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT"; Border = TRUE ; Pos = MAP_APPFONT ( 135 , 30 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -90,6 +92,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH }; MetricField ED_FLINEINDENT { + HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT"; Border = TRUE ; Pos = MAP_APPFONT ( 135 , 46 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -107,6 +110,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH }; CheckBox CB_AUTO { + HelpID = "cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO"; Pos = MAP_APPFONT ( 12 , 61 ) ; Size = MAP_APPFONT ( 120 , 10 ) ; Hide = TRUE ; @@ -127,6 +131,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH }; MetricField ED_TOPDIST { + HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST"; Border = TRUE ; Pos = MAP_APPFONT ( 135 , 88 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -149,6 +154,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH }; MetricField ED_BOTTOMDIST { + HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST"; Border = TRUE ; Pos = MAP_APPFONT ( 135 , 104 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -170,6 +176,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH }; ListBox LB_LINEDIST { + HelpID = "cui:ListBox:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST"; Pos = MAP_APPFONT ( 12 , 133 ) ; Size = MAP_APPFONT ( 55 , 72 ) ; DropDown = TRUE ; @@ -197,6 +204,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH }; MetricField ED_LINEDISTPERCENT { + HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTPERCENT"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 135 , 133 ) ; @@ -216,6 +224,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH }; MetricField ED_LINEDISTMETRIC { + HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC"; Disable = TRUE ; Border = TRUE ; Hide = TRUE ; @@ -245,6 +254,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH }; CheckBox CB_REGISTER { + HelpID = "cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER"; Pos = MAP_APPFONT ( 12 , 162 ) ; Size = MAP_APPFONT ( 120 , 10 ) ; Hide = TRUE ; @@ -275,6 +285,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH }; RadioButton BTN_LEFTALIGN { + HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 161 , 10 ) ; Text [ en-US ] = "~Left" ; @@ -282,18 +293,21 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH }; RadioButton BTN_RIGHTALIGN { + HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 161 , 10 ) ; Text [ en-US ] = "Righ~t" ; }; RadioButton BTN_CENTERALIGN { + HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN"; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 161 , 10 ) ; Text [ en-US ] = "~Center" ; }; RadioButton BTN_JUSTIFYALIGN { + HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN"; Pos = MAP_APPFONT ( 12 , 56 ) ; Size = MAP_APPFONT ( 161 , 10 ) ; Text [ en-US ] = "Justified" ; @@ -315,6 +329,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH }; ListBox LB_LASTLINE { + HelpID = "cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE"; Pos = MAP_APPFONT ( 105 , 70 ) ; Size = MAP_APPFONT ( 70 , 50 ) ; DropDown = TRUE ; @@ -329,6 +344,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH }; CheckBox CB_EXPAND { + HelpID = "cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND"; Pos = MAP_APPFONT ( 20 , 86 ) ; Size = MAP_APPFONT ( 153 , 10 ) ; Hide = TRUE ; @@ -336,6 +352,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH }; CheckBox CB_SNAP { + HelpID = "cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_SNAP"; Pos = MAP_APPFONT ( 20 , 100 ) ; Size = MAP_APPFONT ( 153 , 10 ) ; Hide = TRUE ; @@ -363,6 +380,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH }; ListBox LB_VERTALIGN { + HelpID = "cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_VERTALIGN"; Pos = MAP_APPFONT ( 105 , 133 ) ; Size = MAP_APPFONT ( 70 , 50 ) ; DropDown = TRUE ; @@ -392,6 +410,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH }; ListBox LB_TEXTDIRECTION { + HelpID = "cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_TEXTDIRECTION"; Border = TRUE ; Pos = MAP_APPFONT ( 105 , 165 ) ; Size = MAP_APPFONT ( 146 , 50 ) ; @@ -408,12 +427,14 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH Size = MAP_APPFONT ( 260 , 185 ) ; TriStateBox BTN_HYPHEN { + HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text [ en-US ] = "A~utomatically" ; }; NumericField ED_HYPHENBEFORE { + HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 21 , 26 ) ; @@ -438,6 +459,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; NumericField ED_HYPHENAFTER { + HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 21 , 41 ) ; @@ -469,6 +491,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; NumericField ED_MAXHYPH { + HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH"; Border = TRUE ; Pos = MAP_APPFONT ( 21 , 55 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; @@ -501,6 +524,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; TriStateBox BTN_PAGEBREAK { + HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK"; // Disable = TRUE; Pos = MAP_APPFONT ( 12 , 86 ) ; Size = MAP_APPFONT ( 61 , 10 ) ; @@ -515,6 +539,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; ListBox LB_BREAKTYPE { + HelpID = "cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKTYPE"; Border = TRUE ; Pos = MAP_APPFONT ( 98 , 84 ) ; Size = MAP_APPFONT ( 61 , 50 ) ; @@ -534,6 +559,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; ListBox LB_BREAKPOSITION { + HelpID = "cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKPOSITION"; Border = TRUE ; Pos = MAP_APPFONT ( 211 , 84 ) ; Size = MAP_APPFONT ( 40 , 50 ) ; @@ -546,6 +572,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; TriStateBox BTN_PAGECOLL { + HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL"; // Disable = TRUE; Pos = MAP_APPFONT (21 , 100 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; @@ -554,6 +581,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; ListBox LB_PAGECOLL { + HelpID = "cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL"; // Disable = TRUE; Pos = MAP_APPFONT ( 98 , 98 ) ; Size = MAP_APPFONT ( 61 , 50 ) ; @@ -569,6 +597,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; NumericField ED_PAGENUM { + HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM"; Border = TRUE ; Pos = MAP_APPFONT ( 211 , 98 ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -583,6 +612,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; TriStateBox BTN_KEEPTOGETHER { + HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER"; Pos = MAP_APPFONT ( 12 , 127 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text [ en-US ] = "~Do not split paragraph" ; @@ -590,12 +620,14 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; TriStateBox CB_KEEPTOGETHER { + HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER"; Pos = MAP_APPFONT ( 12, 141 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text [ en-US ] = "~Keep with next paragraph" ; }; TriStateBox BTN_ORPHANS { + HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS"; Disable = TRUE ; Pos = MAP_APPFONT ( 12 , 155 ) ; Size = MAP_APPFONT ( 120 , 10 ) ; @@ -604,6 +636,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; NumericField ED_ORPHANS { + HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 134 , 153 ) ; @@ -628,6 +661,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; TriStateBox BTN_WIDOWS { + HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS"; Disable = TRUE ; Pos = MAP_APPFONT ( 12 , 169 ) ; Size = MAP_APPFONT ( 120 , 10 ) ; @@ -636,6 +670,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; NumericField ED_WIDOWS { + HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 134 , 167 ) ; @@ -676,18 +711,21 @@ TabPage RID_SVXPAGE_PARA_ASIAN }; TriStateBox CB_AS_FORBIDDEN { + HelpID = "cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "Apply list of forbidden characters to the beginning and end of lines"; }; TriStateBox CB_AS_HANG_PUNC { + HelpID = "cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_HANG_PUNC"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "Allow hanging punctuation"; }; TriStateBox CB_AS_SCRIPT_SPACE { + HelpID = "cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_SCRIPT_SPACE"; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "Apply spacing between Asian, Latin and Complex text"; diff --git a/cui/source/tabpages/swpossizetabpage.src b/cui/source/tabpages/swpossizetabpage.src index d8bcad8e8..58b9832c1 100644 --- a/cui/source/tabpages/swpossizetabpage.src +++ b/cui/source/tabpages/swpossizetabpage.src @@ -52,6 +52,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE }; MetricField MF_WIDTH { + HelpID = "cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_WIDTH"; Pos = MAP_APPFONT ( 59 , 14 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; Border = TRUE ; @@ -77,6 +78,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE }; MetricField MF_HEIGHT { + HelpID = "cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HEIGHT"; Pos = MAP_APPFONT ( 59 , 30 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; Border = TRUE ; @@ -95,6 +97,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE }; CheckBox CB_KEEPRATIO { + HelpID = "cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_KEEPRATIO"; Pos = MAP_APPFONT ( 12 , 45 ) ; Size = MAP_APPFONT ( 95 , 10 ) ; TabStop = TRUE ; @@ -114,30 +117,35 @@ TabPage RID_SVXPAGE_SWPOSSIZE }; RadioButton RB_TOPAGE { + HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPAGE"; Pos = MAP_APPFONT ( 122 , 14 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "To ~page"; }; RadioButton RB_TOPARA { + HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPARA"; Pos = MAP_APPFONT ( 122 , 28 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "To paragrap~h"; }; RadioButton RB_TOCHAR { + HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOCHAR"; Pos = MAP_APPFONT ( 122 , 42 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "To cha~racter"; }; RadioButton RB_ASCHAR { + HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_ASCHAR"; Pos = MAP_APPFONT ( 122 , 56 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "~As character" ; }; RadioButton RB_TOFRAME { + HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOFRAME"; Hide = TRUE; Pos = MAP_APPFONT ( 122 , 70 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; @@ -156,6 +164,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE }; TriStateBox CB_POSITION { + HelpID = "cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_POSITION"; Pos = MAP_APPFONT ( 12 , 97 ) ; Size = MAP_APPFONT ( 113 , 10 ) ; TabStop = TRUE ; @@ -163,6 +172,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE }; TriStateBox CB_SIZE { + HelpID = "cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_SIZE"; Pos = MAP_APPFONT ( 122 , 97 ) ; Size = MAP_APPFONT ( 113 , 10 ) ; TabStop = TRUE ; @@ -183,6 +193,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE }; ListBox LB_HORI { + HelpID = "cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORI"; Pos = MAP_APPFONT ( 49 , 124 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; TabStop = TRUE ; @@ -197,6 +208,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE }; MetricField MF_HORIBY { + HelpID = "cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HORIBY"; Border = TRUE ; Pos = MAP_APPFONT ( 123 , 124 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -221,6 +233,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE }; ListBox LB_HORITO { + HelpID = "cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORITO"; Pos = MAP_APPFONT ( 183 , 124 ) ; Size = MAP_APPFONT ( 65 , 60 ) ; TabStop = TRUE ; @@ -228,6 +241,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE }; CheckBox CB_HORIMIRROR { + HelpID = "cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_HORIMIRROR"; Pos = MAP_APPFONT ( 12 , 139 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; @@ -242,6 +256,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE }; ListBox LB_VERT { + HelpID = "cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERT"; Pos = MAP_APPFONT ( 49 , 153 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; TabStop = TRUE ; @@ -256,6 +271,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE }; MetricField MF_VERTBY { + HelpID = "cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_VERTBY"; Border = TRUE ; Pos = MAP_APPFONT ( 123 , 153 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -280,6 +296,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE }; ListBox LB_VERTTO { + HelpID = "cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERTTO"; Pos = MAP_APPFONT ( 183 , 153 ) ; Size = MAP_APPFONT ( 65 , 60 ) ; TabStop = TRUE ; @@ -287,6 +304,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE }; CheckBox CB_FOLLOW { + HelpID = "cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_FOLLOW"; Pos = MAP_APPFONT ( 12 , 168 ) ; Size = MAP_APPFONT ( 113 , 10 ) ; TabStop = TRUE ; diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src index 9ff8c0d6f..af833909d 100644 --- a/cui/source/tabpages/tabarea.src +++ b/cui/source/tabpages/tabarea.src @@ -51,18 +51,21 @@ TabPage RID_SVXPAGE_TRANSPARENCE }; RadioButton RBT_TRANS_OFF { + HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; Text [ en-US ] = "~No transparency"; }; RadioButton RBT_TRANS_LINEAR { + HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "~Transparency"; }; MetricField MTR_TRANSPARENT { + HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT"; Border = TRUE ; Pos = MAP_APPFONT ( 72 , 26 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -78,6 +81,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE }; RadioButton RBT_TRANS_GRADIENT { + HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT"; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; Text [ en-US ] = "Gradient"; @@ -90,6 +94,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE }; ListBox LB_TRGR_GRADIENT_TYPES { + HelpID = "cui:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES"; Border = TRUE ; Pos = MAP_APPFONT ( 72 , 54 ) ; Size = MAP_APPFONT ( 53 , 63 ) ; @@ -113,6 +118,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE }; MetricField MTR_TRGR_CENTER_X { + HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X"; Border = TRUE ; Pos = MAP_APPFONT ( 72 , 70 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -134,6 +140,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE }; MetricField MTR_TRGR_CENTER_Y { + HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 72 , 86 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -155,6 +162,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE }; MetricField MTR_TRGR_ANGLE { + HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( 72 , 102 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -175,6 +183,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE }; MetricField MTR_TRGR_BORDER { + HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER"; Border = TRUE ; Pos = MAP_APPFONT ( 66 + TRANS_GRAD_OFFSET_X, 54 + TRANS_GRAD_OFFSET_Y) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -196,6 +205,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE }; MetricField MTR_TRGR_START_VALUE { + HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE"; Border = TRUE ; Pos = MAP_APPFONT ( 72 , 134 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -217,6 +227,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE }; MetricField MTR_TRGR_END_VALUE { + HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE"; Border = TRUE ; Pos = MAP_APPFONT ( 72 , 150 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -261,6 +272,7 @@ TabPage RID_SVXPAGE_AREA }; ListBox LB_AREA_TYPE { + HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_AREA_TYPE"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 108 , 60 ) ; DropDown = TRUE; @@ -278,6 +290,7 @@ TabPage RID_SVXPAGE_AREA ListBox LB_COLOR { + HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 30 ) ; Size = MAP_APPFONT ( 108 , 103 ) ; @@ -285,6 +298,7 @@ TabPage RID_SVXPAGE_AREA }; ListBox LB_GRADIENT { + HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_GRADIENT"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 30 ) ; Size = MAP_APPFONT ( 108 , 103 ) ; @@ -292,6 +306,7 @@ TabPage RID_SVXPAGE_AREA }; ListBox LB_HATCHING { + HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHING"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 30 ) ; Size = MAP_APPFONT ( 108 , 103 ) ; @@ -299,6 +314,7 @@ TabPage RID_SVXPAGE_AREA }; ListBox LB_BITMAP { + HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_BITMAP"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 30 ) ; Size = MAP_APPFONT ( 108 , 103 ) ; @@ -331,6 +347,7 @@ TabPage RID_SVXPAGE_AREA }; TriStateBox TSB_STEPCOUNT { + HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STEPCOUNT"; Pos = MAP_APPFONT ( 138 , 15 ) ; Size = MAP_APPFONT ( 68 , 10 ) ; TabStop = TRUE ; @@ -338,6 +355,7 @@ TabPage RID_SVXPAGE_AREA }; NumericField NUM_FLD_STEPCOUNT { + HelpID = "cui:NumericField:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT"; Border = TRUE ; Pos = MAP_APPFONT ( 208 , 14 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -355,6 +373,7 @@ TabPage RID_SVXPAGE_AREA CheckBox CB_HATCHBCKGRD { + HelpID = "cui:CheckBox:RID_SVXPAGE_AREA:CB_HATCHBCKGRD"; Pos = MAP_APPFONT ( 132 , 3 ) ; Size = MAP_APPFONT ( 122 , 10 ) ; TabStop = TRUE ; @@ -362,6 +381,7 @@ TabPage RID_SVXPAGE_AREA }; ListBox LB_HATCHBCKGRDCOLOR { + HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 141 , 16 ) ; Size = MAP_APPFONT ( 70 , 100 ) ; @@ -380,6 +400,7 @@ TabPage RID_SVXPAGE_AREA }; TriStateBox TSB_ORIGINAL { + HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_ORIGINAL"; Pos = MAP_APPFONT ( 138 , 15 ) ; Size = MAP_APPFONT ( 48 , 10 ) ; TabStop = TRUE ; @@ -387,6 +408,7 @@ TabPage RID_SVXPAGE_AREA }; TriStateBox TSB_SCALE { + HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_SCALE"; Pos = MAP_APPFONT ( 138 , 30 ) ; Size = MAP_APPFONT ( 48 , 10 ) ; TabStop = TRUE ; @@ -400,6 +422,7 @@ TabPage RID_SVXPAGE_AREA }; MetricField MTR_FLD_X_SIZE { + HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE"; Border = TRUE ; Pos = MAP_APPFONT ( 212 , 14 ) ; Size = MAP_APPFONT ( 36 , 12 ) ; @@ -424,6 +447,7 @@ TabPage RID_SVXPAGE_AREA }; MetricField MTR_FLD_Y_SIZE { + HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE"; Border = TRUE ; Pos = MAP_APPFONT ( 212 , 29 ) ; Size = MAP_APPFONT ( 36 , 12 ) ; @@ -469,6 +493,7 @@ TabPage RID_SVXPAGE_AREA }; MetricField MTR_FLD_X_OFFSET { + HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET"; Border = TRUE ; Pos = MAP_APPFONT ( 219 , 87 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -484,6 +509,7 @@ TabPage RID_SVXPAGE_AREA }; MetricField MTR_FLD_Y_OFFSET { + HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET"; Border = TRUE ; Pos = MAP_APPFONT ( 219 , 102 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -499,6 +525,7 @@ TabPage RID_SVXPAGE_AREA }; TriStateBox TSB_TILE { + HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_TILE"; Pos = MAP_APPFONT ( 138 , 117 ) ; Size = MAP_APPFONT ( 54 , 10 ) ; TabStop = TRUE ; @@ -506,6 +533,7 @@ TabPage RID_SVXPAGE_AREA }; TriStateBox TSB_STRETCH { + HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STRETCH"; Pos = MAP_APPFONT ( 194 , 117 ) ; Size = MAP_APPFONT ( 54 , 10 ) ; TabStop = TRUE ; @@ -519,18 +547,21 @@ TabPage RID_SVXPAGE_AREA }; RadioButton RBT_ROW { + HelpID = "cui:RadioButton:RID_SVXPAGE_AREA:RBT_ROW"; Pos = MAP_APPFONT ( 138 , 144 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; Text [ en-US ] = "Ro~w" ; }; RadioButton RBT_COLUMN { + HelpID = "cui:RadioButton:RID_SVXPAGE_AREA:RBT_COLUMN"; Pos = MAP_APPFONT ( 138 , 158 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; Text [ en-US ] = "Colu~mn" ; }; MetricField MTR_FLD_OFFSET { + HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_OFFSET"; Border = TRUE ; Pos = MAP_APPFONT ( 219 , 157 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -560,6 +591,7 @@ TabPage RID_SVXPAGE_SHADOW }; TriStateBox TSB_SHOW_SHADOW { + HelpID = "cui:TriStateBox:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; TabStop = TRUE ; @@ -587,6 +619,7 @@ TabPage RID_SVXPAGE_SHADOW }; MetricField MTR_FLD_DISTANCE { + HelpID = "cui:MetricField:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE"; Pos = MAP_APPFONT ( 65 , 67 ) ; Size = MAP_APPFONT ( 47 , 12 ) ; Border = TRUE ; @@ -604,6 +637,7 @@ TabPage RID_SVXPAGE_SHADOW }; ListBox LB_SHADOW_COLOR { + HelpID = "cui:ListBox:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR"; Pos = MAP_APPFONT ( 65 , 86 ) ; Size = MAP_APPFONT ( 57 , 100 ) ; DropDown = TRUE ; @@ -625,6 +659,7 @@ TabPage RID_SVXPAGE_SHADOW }; MetricField MTR_SHADOW_TRANSPARENT { + HelpID = "cui:MetricField:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT"; Border = TRUE ; Pos = MAP_APPFONT ( 65 , 105 ) ; Size = MAP_APPFONT ( 47 , 12 ) ; @@ -667,6 +702,7 @@ TabPage RID_SVXPAGE_HATCH }; MetricField MTR_FLD_DISTANCE { + HelpID = "cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_DISTANCE"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 25 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -689,6 +725,7 @@ TabPage RID_SVXPAGE_HATCH }; MetricField MTR_FLD_ANGLE { + HelpID = "cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 52 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -717,6 +754,7 @@ TabPage RID_SVXPAGE_HATCH }; ListBox LB_LINE_TYPE { + HelpID = "cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_TYPE"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 134 ) ; Size = MAP_APPFONT ( 62 , 62 ) ; @@ -737,6 +775,7 @@ TabPage RID_SVXPAGE_HATCH }; ListBox LB_LINE_COLOR { + HelpID = "cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 161 ) ; Size = MAP_APPFONT ( 62 , 100 ) ; @@ -746,6 +785,7 @@ TabPage RID_SVXPAGE_HATCH }; ListBox LB_HATCHINGS { + HelpID = "cui:ListBox:RID_SVXPAGE_HATCH:LB_HATCHINGS"; Border = TRUE ; Pos = MAP_APPFONT ( 103 , 14 ) ; Size = MAP_APPFONT ( 88 , 110 ) ; @@ -759,6 +799,7 @@ TabPage RID_SVXPAGE_HATCH }; PushButton BTN_ADD { + HelpID = "cui:PushButton:RID_SVXPAGE_HATCH:BTN_ADD"; Pos = MAP_APPFONT ( 197 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Add..." ; @@ -766,6 +807,7 @@ TabPage RID_SVXPAGE_HATCH }; PushButton BTN_MODIFY { + HelpID = "cui:PushButton:RID_SVXPAGE_HATCH:BTN_MODIFY"; Pos = MAP_APPFONT ( 197 , 32 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Modify..." ; @@ -773,6 +815,7 @@ TabPage RID_SVXPAGE_HATCH }; PushButton BTN_DELETE { + HelpID = "cui:PushButton:RID_SVXPAGE_HATCH:BTN_DELETE"; Pos = MAP_APPFONT ( 197 , 68 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete..." ; @@ -780,6 +823,7 @@ TabPage RID_SVXPAGE_HATCH }; ImageButton BTN_LOAD { + HelpID = "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD"; Pos = MAP_APPFONT ( 197 , 104 ) ; Size = MAP_APPFONT ( 16 , 16 ) ; TabStop = TRUE ; @@ -795,6 +839,7 @@ TabPage RID_SVXPAGE_HATCH }; ImageButton BTN_SAVE { + HelpID = "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE"; Pos = MAP_APPFONT ( 197 , 124 ) ; Size = MAP_APPFONT ( 16 , 16 ) ; TabStop = TRUE ; @@ -843,6 +888,7 @@ TabPage RID_SVXPAGE_BITMAP }; ListBox LB_COLOR { + HelpID = "cui:ListBox:RID_SVXPAGE_BITMAP:LB_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 115 ) ; Size = MAP_APPFONT ( 62 , 100 ) ; @@ -858,6 +904,7 @@ TabPage RID_SVXPAGE_BITMAP }; ListBox LB_BACKGROUND_COLOR { + HelpID = "cui:ListBox:RID_SVXPAGE_BITMAP:LB_BACKGROUND_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 142 ) ; Size = MAP_APPFONT ( 62 , 100 ) ; @@ -872,6 +919,7 @@ TabPage RID_SVXPAGE_BITMAP }; ListBox LB_BITMAPS { + HelpID = "cui:ListBox:RID_SVXPAGE_BITMAP:LB_BITMAPS"; Border = TRUE ; Pos = MAP_APPFONT ( 103 , 14 ) ; Size = MAP_APPFONT ( 88 , 110 ) ; @@ -885,6 +933,7 @@ TabPage RID_SVXPAGE_BITMAP }; PushButton BTN_ADD { + HelpID = "cui:PushButton:RID_SVXPAGE_BITMAP:BTN_ADD"; Pos = MAP_APPFONT ( 197 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Add..." ; @@ -892,6 +941,7 @@ TabPage RID_SVXPAGE_BITMAP }; PushButton BTN_MODIFY { + HelpID = "cui:PushButton:RID_SVXPAGE_BITMAP:BTN_MODIFY"; Pos = MAP_APPFONT ( 197 , 32 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Modify..." ; @@ -899,6 +949,7 @@ TabPage RID_SVXPAGE_BITMAP }; PushButton BTN_IMPORT { + HelpID = "cui:PushButton:RID_SVXPAGE_BITMAP:BTN_IMPORT"; Pos = MAP_APPFONT ( 197 , 50 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Import..." ; @@ -906,6 +957,7 @@ TabPage RID_SVXPAGE_BITMAP }; PushButton BTN_DELETE { + HelpID = "cui:PushButton:RID_SVXPAGE_BITMAP:BTN_DELETE"; Pos = MAP_APPFONT ( 197 , 68 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete..." ; @@ -913,6 +965,7 @@ TabPage RID_SVXPAGE_BITMAP }; ImageButton BTN_LOAD { + HelpID = "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD"; Pos = MAP_APPFONT ( 197 , 104 ) ; Size = MAP_APPFONT ( 16 , 16 ) ; TabStop = TRUE ; @@ -928,6 +981,7 @@ TabPage RID_SVXPAGE_BITMAP }; ImageButton BTN_SAVE { + HelpID = "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE"; Pos = MAP_APPFONT ( 197 , 124 ) ; Size = MAP_APPFONT ( 16 , 16 ) ; TabStop = TRUE ; @@ -963,6 +1017,7 @@ TabPage RID_SVXPAGE_GRADIENT }; ListBox LB_GRADIENT_TYPES { + HelpID = "cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES"; Border = TRUE ; Pos = MAP_APPFONT ( 49 , 14 ) ; Size = MAP_APPFONT ( 48, 63 ) ; @@ -986,6 +1041,7 @@ TabPage RID_SVXPAGE_GRADIENT }; MetricField MTR_CENTER_X { + HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_X"; Border = TRUE ; Pos = MAP_APPFONT ( 49 , 30 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -1007,6 +1063,7 @@ TabPage RID_SVXPAGE_GRADIENT }; MetricField MTR_CENTER_Y { + HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 49 , 46 ) ; Size = MAP_APPFONT ( 40, 12 ) ; @@ -1028,6 +1085,7 @@ TabPage RID_SVXPAGE_GRADIENT }; MetricField MTR_ANGLE { + HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( 49 , 62 ) ; Size = MAP_APPFONT ( 40, 12 ) ; @@ -1048,6 +1106,7 @@ TabPage RID_SVXPAGE_GRADIENT }; MetricField MTR_BORDER { + HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_BORDER"; Border = TRUE ; Pos = MAP_APPFONT ( 49 , 78 ) ; Size = MAP_APPFONT ( 40, 12 ) ; @@ -1069,6 +1128,7 @@ TabPage RID_SVXPAGE_GRADIENT }; ListBox LB_COLOR_FROM { + HelpID = "cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM"; Border = TRUE ; Pos = MAP_APPFONT ( 49 , 97 ) ; Size = MAP_APPFONT ( 48, 100 ) ; @@ -1078,6 +1138,7 @@ TabPage RID_SVXPAGE_GRADIENT }; MetricField MTR_COLOR_FROM { + HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM"; Border = TRUE ; Pos = MAP_APPFONT ( 49 , 113 ) ; Size = MAP_APPFONT ( 40, 12 ) ; @@ -1099,6 +1160,7 @@ TabPage RID_SVXPAGE_GRADIENT }; ListBox LB_COLOR_TO { + HelpID = "cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_TO"; Border = TRUE ; Pos = MAP_APPFONT ( 49 , 131 ) ; Size = MAP_APPFONT ( 48, 100 ) ; @@ -1108,6 +1170,7 @@ TabPage RID_SVXPAGE_GRADIENT }; MetricField MTR_COLOR_TO { + HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO"; Border = TRUE ; Pos = MAP_APPFONT ( 49 , 147 ) ; Size = MAP_APPFONT ( 40, 12 ) ; @@ -1123,6 +1186,7 @@ TabPage RID_SVXPAGE_GRADIENT }; ListBox LB_GRADIENTS { + HelpID = "cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENTS"; Border = TRUE ; Pos = MAP_APPFONT ( 103 , 14 ) ; Size = MAP_APPFONT ( 88 , 110 ) ; @@ -1136,6 +1200,7 @@ TabPage RID_SVXPAGE_GRADIENT }; PushButton BTN_ADD { + HelpID = "cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_ADD"; Pos = MAP_APPFONT ( 197 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Add..." ; @@ -1143,6 +1208,7 @@ TabPage RID_SVXPAGE_GRADIENT }; PushButton BTN_MODIFY { + HelpID = "cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_MODIFY"; Pos = MAP_APPFONT ( 197 , 32 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Modify..." ; @@ -1150,6 +1216,7 @@ TabPage RID_SVXPAGE_GRADIENT }; PushButton BTN_DELETE { + HelpID = "cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_DELETE"; Pos = MAP_APPFONT ( 197 , 68 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete..." ; @@ -1157,6 +1224,7 @@ TabPage RID_SVXPAGE_GRADIENT }; ImageButton BTN_LOAD { + HelpID = "cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_LOAD"; Pos = MAP_APPFONT ( 197 , 104 ) ; Size = MAP_APPFONT ( 16 , 16 ) ; TabStop = TRUE ; @@ -1172,6 +1240,7 @@ TabPage RID_SVXPAGE_GRADIENT }; ImageButton BTN_SAVE { + HelpID = "cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_SAVE"; Pos = MAP_APPFONT ( 197 , 124 ) ; Size = MAP_APPFONT ( 16 , 16 ) ; TabStop = TRUE ; @@ -1208,6 +1277,7 @@ TabPage RID_SVXPAGE_COLOR }; Edit EDT_NAME { + HelpID = "cui:Edit:RID_SVXPAGE_COLOR:EDT_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 14 ) ; Size = MAP_APPFONT ( 76 , 12 ) ; @@ -1221,6 +1291,7 @@ TabPage RID_SVXPAGE_COLOR }; ListBox LB_COLOR { + HelpID = "cui:ListBox:RID_SVXPAGE_COLOR:LB_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 30 ) ; Size = MAP_APPFONT ( 76 , 100 ) ; @@ -1258,6 +1329,7 @@ TabPage RID_SVXPAGE_COLOR }; ListBox LB_COLORMODEL { + HelpID = "cui:ListBox:RID_SVXPAGE_COLOR:LB_COLORMODEL"; Border = TRUE ; Pos = MAP_APPFONT ( 157 , 71 ) ; Size = MAP_APPFONT ( 34 , 12 ) ; @@ -1277,6 +1349,7 @@ TabPage RID_SVXPAGE_COLOR }; MetricField MTR_FLD_1 { + HelpID = "cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_1"; Border = TRUE ; Pos = MAP_APPFONT ( 157 , 87 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -1296,6 +1369,7 @@ TabPage RID_SVXPAGE_COLOR }; MetricField MTR_FLD_2 { + HelpID = "cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_2"; Border = TRUE ; Pos = MAP_APPFONT ( 157 , 103 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -1315,6 +1389,7 @@ TabPage RID_SVXPAGE_COLOR }; MetricField MTR_FLD_3 { + HelpID = "cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_3"; Border = TRUE ; Pos = MAP_APPFONT ( 157 , 119 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -1334,6 +1409,7 @@ TabPage RID_SVXPAGE_COLOR }; MetricField MTR_FLD_4 { + HelpID = "cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_4"; Border = TRUE ; Pos = MAP_APPFONT ( 157 , 135 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -1347,6 +1423,7 @@ TabPage RID_SVXPAGE_COLOR }; PushButton BTN_ADD { + HelpID = "cui:PushButton:RID_SVXPAGE_COLOR:BTN_ADD"; Pos = MAP_APPFONT ( 197 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Add" ; @@ -1354,6 +1431,7 @@ TabPage RID_SVXPAGE_COLOR }; PushButton BTN_WORK_ON { + HelpID = "cui:PushButton:RID_SVXPAGE_COLOR:BTN_WORK_ON"; Pos = MAP_APPFONT ( 197 , 50 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Edit..." ; @@ -1361,6 +1439,7 @@ TabPage RID_SVXPAGE_COLOR }; PushButton BTN_DELETE { + HelpID = "cui:PushButton:RID_SVXPAGE_COLOR:BTN_DELETE"; Pos = MAP_APPFONT ( 197 , 68 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete..." ; @@ -1368,6 +1447,7 @@ TabPage RID_SVXPAGE_COLOR }; PushButton BTN_MODIFY { + HelpID = "cui:PushButton:RID_SVXPAGE_COLOR:BTN_MODIFY"; Pos = MAP_APPFONT ( 197, 32 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Modify" ; @@ -1375,6 +1455,7 @@ TabPage RID_SVXPAGE_COLOR }; ImageButton BTN_LOAD { + HelpID = "cui:ImageButton:RID_SVXPAGE_COLOR:BTN_LOAD"; Pos = MAP_APPFONT ( 197 , 104 ) ; Size = MAP_APPFONT ( 16 , 16 ) ; TabStop = TRUE ; @@ -1390,6 +1471,7 @@ TabPage RID_SVXPAGE_COLOR }; ImageButton BTN_SAVE { + HelpID = "cui:ImageButton:RID_SVXPAGE_COLOR:BTN_SAVE"; Pos = MAP_APPFONT ( 197 , 124 ) ; Size = MAP_APPFONT ( 16 , 16 ) ; TabStop = TRUE ; diff --git a/cui/source/tabpages/tabline.src b/cui/source/tabpages/tabline.src index 435ff956d..83fc9a402 100644 --- a/cui/source/tabpages/tabline.src +++ b/cui/source/tabpages/tabline.src @@ -55,6 +55,7 @@ TabPage RID_SVXPAGE_LINE }; ListBox LB_LINE_STYLE { + HelpID = "cui:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 25 ) ; Size = MAP_APPFONT ( 100 , 100 ) ; @@ -70,6 +71,7 @@ TabPage RID_SVXPAGE_LINE }; ListBox LB_COLOR { + HelpID = "cui:ListBox:RID_SVXPAGE_LINE:LB_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 52 ) ; Size = MAP_APPFONT ( 100 , 100 ) ; @@ -85,6 +87,7 @@ TabPage RID_SVXPAGE_LINE }; MetricField MTR_FLD_LINE_WIDTH { + HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 79 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -108,6 +111,7 @@ TabPage RID_SVXPAGE_LINE }; MetricField MTR_LINE_TRANSPARENT { + HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 106 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -141,6 +145,7 @@ TabPage RID_SVXPAGE_LINE }; ListBox LB_START_STYLE { + HelpID = "cui:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE"; Border = TRUE ; Pos = MAP_APPFONT ( 130 , 25 ) ; Size = MAP_APPFONT ( 57 , 99 ) ; @@ -150,6 +155,7 @@ TabPage RID_SVXPAGE_LINE }; ListBox LB_END_STYLE { + HelpID = "cui:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE"; Border = TRUE ; Pos = MAP_APPFONT ( 191 , 25 ) ; Size = MAP_APPFONT ( 57 , 100 ) ; @@ -165,6 +171,7 @@ TabPage RID_SVXPAGE_LINE }; MetricField MTR_FLD_START_WIDTH { + HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 130 , 52 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -182,6 +189,7 @@ TabPage RID_SVXPAGE_LINE }; MetricField MTR_FLD_END_WIDTH { + HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 191 , 52 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -199,6 +207,7 @@ TabPage RID_SVXPAGE_LINE }; TriStateBox TSB_CENTER_START { + HelpID = "cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START"; Pos = MAP_APPFONT ( 130 , 68 ) ; Size = MAP_APPFONT ( 57 , 10 ) ; Text [ en-US ] = "Ce~nter" ; @@ -206,6 +215,7 @@ TabPage RID_SVXPAGE_LINE }; TriStateBox TSB_CENTER_END { + HelpID = "cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END"; Pos = MAP_APPFONT ( 191 , 68 ) ; Size = MAP_APPFONT ( 57 , 10 ) ; Text [ en-US ] = "C~enter" ; @@ -213,6 +223,7 @@ TabPage RID_SVXPAGE_LINE }; CheckBox CBX_SYNCHRONIZE { + HelpID = "cui:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE"; // #116827# // Pos = MAP_APPFONT ( 130 , 107 ) ; Pos = MAP_APPFONT ( 130 , 68 + (16 - 4) ) ; @@ -238,6 +249,7 @@ TabPage RID_SVXPAGE_LINE }; ListBox LB_EDGE_STYLE { + HelpID = "cui:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE"; Border = TRUE ; Pos = MAP_APPFONT ( 130 , 25 + (16 * 6) - 4 ) ; Size = MAP_APPFONT ( 57 , 99 ) ; @@ -273,6 +285,7 @@ TabPage RID_SVXPAGE_LINE MenuButton MB_SYMBOL_BITMAP { + HelpID = "cui:MenuButton:RID_SVXPAGE_LINE:MB_SYMBOL_BITMAP"; Hide = TRUE ; Pos = MAP_APPFONT ( 130 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; @@ -319,6 +332,7 @@ TabPage RID_SVXPAGE_LINE }; MetricField MF_SYMBOL_WIDTH { + HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_WIDTH"; Pos = MAP_APPFONT ( 191 , 30 ); Size = MAP_APPFONT ( 57 , 12 ) ; Border = TRUE ; @@ -345,6 +359,7 @@ TabPage RID_SVXPAGE_LINE }; MetricField MF_SYMBOL_HEIGHT { + HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_HEIGHT"; Pos = MAP_APPFONT ( 191 , 46 ); Size = MAP_APPFONT ( 57 , 12 ) ; Border = TRUE ; @@ -364,6 +379,7 @@ TabPage RID_SVXPAGE_LINE }; CheckBox CB_SYMBOL_RATIO { + HelpID = "cui:CheckBox:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO"; Hide = TRUE ; Pos = MAP_APPFONT ( 130 , 62 ); Size = MAP_APPFONT ( 118 , 10 ) ; @@ -394,6 +410,7 @@ TabPage RID_SVXPAGE_LINE_DEF }; ListBox LB_TYPE_1 { + HelpID = "cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_1"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , 32 ) ; Size = MAP_APPFONT ( 43 , 49 ) ; @@ -407,6 +424,7 @@ TabPage RID_SVXPAGE_LINE_DEF }; ListBox LB_TYPE_2 { + HelpID = "cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_2"; Border = TRUE ; Pos = MAP_APPFONT ( 113 , 32 ) ; Size = MAP_APPFONT ( 43 , 49 ) ; @@ -426,6 +444,7 @@ TabPage RID_SVXPAGE_LINE_DEF }; NumericField NUM_FLD_1 { + HelpID = "cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_1"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , 48 ) ; Size = MAP_APPFONT ( 43 , 12 ) ; @@ -440,6 +459,7 @@ TabPage RID_SVXPAGE_LINE_DEF }; NumericField NUM_FLD_2 { + HelpID = "cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_2"; Border = TRUE ; Pos = MAP_APPFONT ( 113 , 48 ) ; Size = MAP_APPFONT ( 43 , 12 ) ; @@ -460,6 +480,7 @@ TabPage RID_SVXPAGE_LINE_DEF }; MetricField MTR_FLD_LENGTH_1 { + HelpID = "cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_1"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , 64 ) ; Size = MAP_APPFONT ( 43 , 12 ) ; @@ -480,6 +501,7 @@ TabPage RID_SVXPAGE_LINE_DEF }; MetricField MTR_FLD_LENGTH_2 { + HelpID = "cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_2"; Border = TRUE ; Pos = MAP_APPFONT ( 113 , 64 ) ; Size = MAP_APPFONT ( 43 , 12 ) ; @@ -506,6 +528,7 @@ TabPage RID_SVXPAGE_LINE_DEF }; MetricField MTR_FLD_DISTANCE { + HelpID = "cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_DISTANCE"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , 79 ) ; Size = MAP_APPFONT ( 43 , 12 ) ; @@ -524,6 +547,7 @@ TabPage RID_SVXPAGE_LINE_DEF }; CheckBox CBX_SYNCHRONIZE { + HelpID = "cui:CheckBox:RID_SVXPAGE_LINE_DEF:CBX_SYNCHRONIZE"; Pos = MAP_APPFONT ( 12 , 95 ) ; Size = MAP_APPFONT ( 174 , 10 ) ; Text [ en-US ] = "~Fit to line width" ; @@ -540,6 +564,7 @@ TabPage RID_SVXPAGE_LINE_DEF }; ListBox LB_LINESTYLES { + HelpID = "cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_LINESTYLES"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , 14 ) ; Size = MAP_APPFONT ( 120 , 80 ) ; @@ -549,6 +574,7 @@ TabPage RID_SVXPAGE_LINE_DEF }; PushButton BTN_ADD { + HelpID = "cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_ADD"; Pos = MAP_APPFONT ( 198 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Add..." ; @@ -556,6 +582,7 @@ TabPage RID_SVXPAGE_LINE_DEF }; PushButton BTN_MODIFY { + HelpID = "cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_MODIFY"; Pos = MAP_APPFONT ( 198 , 34 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Modify..." ; @@ -563,6 +590,7 @@ TabPage RID_SVXPAGE_LINE_DEF }; PushButton BTN_DELETE { + HelpID = "cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_DELETE"; Pos = MAP_APPFONT ( 198 , 54 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete..." ; @@ -570,6 +598,7 @@ TabPage RID_SVXPAGE_LINE_DEF }; ImageButton BTN_LOAD { + HelpID = "cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_LOAD"; Pos = MAP_APPFONT ( 198 , 74 ) ; Size = MAP_APPFONT ( 16 , 16 ) ; TabStop = TRUE ; @@ -585,6 +614,7 @@ TabPage RID_SVXPAGE_LINE_DEF }; ImageButton BTN_SAVE { + HelpID = "cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_SAVE"; Pos = MAP_APPFONT ( 198 , 96 ) ; Size = MAP_APPFONT ( 16 , 16 ) ; TabStop = TRUE ; @@ -638,6 +668,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF }; Edit EDT_NAME { + HelpID = "cui:Edit:RID_SVXPAGE_LINEEND_DEF:EDT_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 98 , 14 ) ; Size = MAP_APPFONT ( 87 , 12 ) ; @@ -651,6 +682,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF }; ListBox LB_LINEENDS { + HelpID = "cui:ListBox:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS"; Border = TRUE ; Pos = MAP_APPFONT ( 98 , 30 ) ; Size = MAP_APPFONT ( 87 , 80 ) ; @@ -660,6 +692,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF }; PushButton BTN_ADD { + HelpID = "cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_ADD"; Pos = MAP_APPFONT ( 198 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Add..." ; @@ -667,6 +700,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF }; PushButton BTN_MODIFY { + HelpID = "cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY"; Pos = MAP_APPFONT ( 198 , 34 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Modify..." ; @@ -674,6 +708,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF }; PushButton BTN_DELETE { + HelpID = "cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE"; Pos = MAP_APPFONT ( 198 , 54 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete..." ; @@ -681,6 +716,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF }; ImageButton BTN_LOAD { + HelpID = "cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD"; Pos = MAP_APPFONT ( 198 , 74 ) ; Size = MAP_APPFONT ( 16 , 16 ) ; TabStop = TRUE ; @@ -696,6 +732,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF }; ImageButton BTN_SAVE { + HelpID = "cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE"; Pos = MAP_APPFONT ( 198 , 96 ) ; Size = MAP_APPFONT ( 16 , 16 ) ; TabStop = TRUE ; diff --git a/cui/source/tabpages/tabstpge.src b/cui/source/tabpages/tabstpge.src index cb743cf84..860de15db 100644 --- a/cui/source/tabpages/tabstpge.src +++ b/cui/source/tabpages/tabstpge.src @@ -45,6 +45,7 @@ TabPage RID_SVXPAGE_TABULATOR }; MetricBox ED_TABPOS { + HelpID = "cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 39 , 165 ) ; Minimum = -5600 ; @@ -66,6 +67,7 @@ TabPage RID_SVXPAGE_TABULATOR }; RadioButton BTN_TABTYPE_LEFT { + HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT"; Pos = MAP_APPFONT ( 66 , 14 ) ; Size = MAP_APPFONT ( 89 , 10 ) ; Text [ en-US ] = "~Left" ; @@ -78,6 +80,7 @@ TabPage RID_SVXPAGE_TABULATOR }; RadioButton BTN_TABTYPE_RIGHT { + HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT"; Pos = MAP_APPFONT ( 66 , 28 ) ; Size = MAP_APPFONT ( 89 , 10 ) ; Text [ en-US ] = "Righ~t" ; @@ -89,6 +92,7 @@ TabPage RID_SVXPAGE_TABULATOR }; RadioButton BTN_TABTYPE_CENTER { + HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER"; Pos = MAP_APPFONT ( 66 , 42 ) ; Size = MAP_APPFONT ( 89 , 10 ) ; Text [ en-US ] = "C~entered" ; @@ -100,6 +104,7 @@ TabPage RID_SVXPAGE_TABULATOR }; RadioButton BTN_TABTYPE_DECIMAL { + HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL"; Pos = MAP_APPFONT ( 66 , 56 ) ; Size = MAP_APPFONT ( 89 , 10 ) ; Text [ en-US ] = "Deci~mal" ; @@ -117,6 +122,7 @@ TabPage RID_SVXPAGE_TABULATOR }; Edit ED_TABTYPE_DECCHAR { + HelpID = "cui:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR"; Border = TRUE ; Pos = MAP_APPFONT ( 156 , 68 ) ; Size = MAP_APPFONT ( 9 , 12 ) ; @@ -130,6 +136,7 @@ TabPage RID_SVXPAGE_TABULATOR }; RadioButton BTN_FILLCHAR_NO { + HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO"; Pos = MAP_APPFONT ( 66 , 97 ) ; Size = MAP_APPFONT ( 89 , 10 ) ; Text [ en-US ] = "N~one" ; @@ -137,30 +144,35 @@ TabPage RID_SVXPAGE_TABULATOR }; RadioButton BTN_FILLCHAR_POINTS { + HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS"; Pos = MAP_APPFONT ( 66 , 111 ) ; Size = MAP_APPFONT ( 89 , 10 ) ; Text = "~........" ; }; RadioButton BTN_FILLCHAR_DASHLINE { + HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE"; Pos = MAP_APPFONT ( 66 , 125 ) ; Size = MAP_APPFONT ( 89 , 10 ) ; Text = "~--------" ; }; RadioButton BTN_FILLCHAR_UNDERSCORE { + HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE"; Pos = MAP_APPFONT ( 66 , 139 ) ; Size = MAP_APPFONT ( 89 , 10 ) ; Text = "~_____" ; }; RadioButton BTN_FILLCHAR_OTHER { + HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER"; Pos = MAP_APPFONT ( 66 , 153 ) ; Size = MAP_APPFONT ( 89 , 10 ) ; Text [ en-US ] = "Character" ; }; Edit ED_FILLCHAR_OTHER { + HelpID = "cui:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER"; Border = TRUE ; Pos = MAP_APPFONT ( 156 , 151 ) ; Size = MAP_APPFONT ( 9 , 12 ) ; @@ -168,18 +180,21 @@ TabPage RID_SVXPAGE_TABULATOR }; PushButton BTN_NEW { + HelpID = "cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW"; Pos = MAP_APPFONT ( 204 , 6 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~New" ; }; PushButton BTN_DELALL { + HelpID = "cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL"; Pos = MAP_APPFONT ( 204 , 23 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Delete ~All" ; }; PushButton BTN_DEL { + HelpID = "cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL"; Pos = MAP_APPFONT ( 204 , 40 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete" ; diff --git a/cui/source/tabpages/textanim.src b/cui/source/tabpages/textanim.src index c665b2fa5..b0d4ee712 100644 --- a/cui/source/tabpages/textanim.src +++ b/cui/source/tabpages/textanim.src @@ -71,6 +71,7 @@ // RID_SVXPAGE_TEXTANIMATION --------------------------------------------- TabPage RID_SVXPAGE_TEXTANIMATION { + HelpID = "cui:TabPage:RID_SVXPAGE_TEXTANIMATION"; SVLook = TRUE ; Hide = TRUE ; Size = MAP_APPFONT ( MA_TOTAL_WIDTH , 185 ) ; @@ -91,6 +92,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION }; ListBox LB_EFFECT { + HelpID = "cui:ListBox:RID_SVXPAGE_TEXTANIMATION:LB_EFFECT"; Border = TRUE ; Pos = MAP_APPFONT ( MA_EFFECTLIST_X, MA_CURR_Y + 1 ) ; Size = MAP_APPFONT ( MA_EFFECTLIST_WIDTH , 57 ) ; @@ -117,6 +119,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION }; ImageButton BTN_UP { + HelpID = "cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_UP"; Pos = MAP_APPFONT ( MA_TOTAL_WIDTH - MA_MOVEBUT_GRACE_X - 2*MA_BUTTON_WIDTH - RSC_SP_TBPG_INNERBORDER_RIGHT - RSC_SP_FLGR_INNERBORDER_RIGHT, RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ); Size = BUTTON_SIZE ; @@ -125,6 +128,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION }; ImageButton BTN_LEFT { + HelpID = "cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_LEFT"; Pos = MAP_APPFONT ( MA_TOTAL_WIDTH - MA_MOVEBUT_GRACE_X - 3*MA_BUTTON_WIDTH - RSC_SP_TBPG_INNERBORDER_RIGHT - RSC_SP_FLGR_INNERBORDER_RIGHT, RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + MA_BUTTON_HEIGHT); Size = BUTTON_SIZE ; @@ -133,6 +137,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION }; ImageButton BTN_RIGHT { + HelpID = "cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_RIGHT"; Pos = MAP_APPFONT ( MA_TOTAL_WIDTH - MA_MOVEBUT_GRACE_X - MA_BUTTON_WIDTH - RSC_SP_TBPG_INNERBORDER_RIGHT - RSC_SP_FLGR_INNERBORDER_RIGHT, RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + MA_BUTTON_HEIGHT ) ; Size = BUTTON_SIZE ; @@ -141,6 +146,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION }; ImageButton BTN_DOWN { + HelpID = "cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_DOWN"; Pos = MAP_APPFONT ( MA_TOTAL_WIDTH - MA_MOVEBUT_GRACE_X - 2*MA_BUTTON_WIDTH - RSC_SP_TBPG_INNERBORDER_RIGHT - RSC_SP_FLGR_INNERBORDER_RIGHT, RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + 2*MA_BUTTON_HEIGHT ) ; Size = BUTTON_SIZE ; @@ -157,6 +163,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION #define MA_CURR_Y2 RSC_SP_TBPG_INNERBORDER_TOP + MA_EFFECTSGROUP_HEIGHT + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP TriStateBox TSB_START_INSIDE { + HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_START_INSIDE"; TabStop = TRUE ; Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y2 ) ; Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT - 12, RSC_CD_CHECKBOX_HEIGHT ); @@ -165,6 +172,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION #define MA_CURR_Y3 MA_CURR_Y2 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y TriStateBox TSB_STOP_INSIDE { + HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_STOP_INSIDE"; TabStop = TRUE ; Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y3 ) ; Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT - 12, RSC_CD_CHECKBOX_HEIGHT ); @@ -181,6 +189,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION #define MA_CURR_Y5 MA_CURR_Y4 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP TriStateBox TSB_ENDLESS { + HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_ENDLESS"; TabStop = TRUE ; Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 9 , MA_CURR_Y5 + 2 ) ; Size = MAP_APPFONT ( 71 , RSC_CD_CHECKBOX_HEIGHT ) ; @@ -188,6 +197,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION }; NumericField NUM_FLD_COUNT { + HelpID = "cui:NumericField:RID_SVXPAGE_TEXTANIMATION:NUM_FLD_COUNT"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 80 + RSC_SP_CTRL_GROUP_X, MA_CURR_Y5 ) ; @@ -209,6 +219,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION #define MA_CURR_Y7 MA_CURR_Y6 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP TriStateBox TSB_PIXEL { + HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_PIXEL"; TabStop = TRUE ; Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 9 , MA_CURR_Y7 + 2 ) ; Size = MAP_APPFONT ( 71 , RSC_CD_CHECKBOX_HEIGHT ) ; @@ -216,6 +227,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION }; MetricField MTR_FLD_AMOUNT { + HelpID = "cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_AMOUNT"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 80 + RSC_SP_CTRL_GROUP_X, MA_CURR_Y7 ) ; @@ -242,6 +254,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION #define MA_CURR_Y9 MA_CURR_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP TriStateBox TSB_AUTO { + HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_AUTO"; Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 9 , MA_CURR_Y9 + 2 ) ; Size = MAP_APPFONT ( 71 , RSC_CD_CHECKBOX_HEIGHT ) ; TabStop = TRUE ; @@ -249,6 +262,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION }; MetricField MTR_FLD_DELAY { + HelpID = "cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_DELAY"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 80 + RSC_SP_CTRL_GROUP_X, MA_CURR_Y9 ) ; diff --git a/cui/source/tabpages/textattr.src b/cui/source/tabpages/textattr.src index 23a2138cb..45e5e9cb7 100644 --- a/cui/source/tabpages/textattr.src +++ b/cui/source/tabpages/textattr.src @@ -46,6 +46,7 @@ TabPage RID_SVXPAGE_TEXTATTR }; TriStateBox TSB_AUTOGROW_WIDTH { + HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_WIDTH"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 102 , 10 ) ; @@ -53,6 +54,7 @@ TabPage RID_SVXPAGE_TEXTATTR }; TriStateBox TSB_AUTOGROW_HEIGHT { + HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_HEIGHT"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 102 , 10 ) ; @@ -60,6 +62,7 @@ TabPage RID_SVXPAGE_TEXTATTR }; TriStateBox TSB_FIT_TO_SIZE { + HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FIT_TO_SIZE"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 102 , 10 ) ; @@ -67,6 +70,7 @@ TabPage RID_SVXPAGE_TEXTATTR }; TriStateBox TSB_CONTOUR { + HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_CONTOUR"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 56 ) ; Size = MAP_APPFONT ( 102 , 10 ) ; @@ -74,6 +78,7 @@ TabPage RID_SVXPAGE_TEXTATTR }; TriStateBox TSB_WORDWRAP_TEXT { + HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_WORDWRAP_TEXT"; TabStop = TRUE; Pos = MAP_APPFONT( 132, 14 ) ; Size = MAP_APPFONT( 127 , 10 ) ; @@ -81,6 +86,7 @@ TabPage RID_SVXPAGE_TEXTATTR }; TriStateBox TSB_AUTOGROW_SIZE { + HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_SIZE"; TabStop = TRUE; Pos = MAP_APPFONT( 132, 28 ); Size = MAP_APPFONT( 127 , 10 ); @@ -118,6 +124,7 @@ TabPage RID_SVXPAGE_TEXTATTR }; MetricField MTR_FLD_LEFT { + HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_LEFT"; Border = TRUE ; Pos = MAP_APPFONT ( 69 , 83 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -134,6 +141,7 @@ TabPage RID_SVXPAGE_TEXTATTR }; MetricField MTR_FLD_RIGHT { + HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_RIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 69 , 99 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -150,6 +158,7 @@ TabPage RID_SVXPAGE_TEXTATTR }; MetricField MTR_FLD_TOP { + HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_TOP"; Border = TRUE ; Pos = MAP_APPFONT ( 69 , 115 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -166,6 +175,7 @@ TabPage RID_SVXPAGE_TEXTATTR }; MetricField MTR_FLD_BOTTOM { + HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_BOTTOM"; Border = TRUE ; Pos = MAP_APPFONT ( 69 , 131 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -202,6 +212,7 @@ TabPage RID_SVXPAGE_TEXTATTR }; TriStateBox TSB_FULL_WIDTH { + HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FULL_WIDTH"; TabStop = TRUE ; Pos = MAP_APPFONT ( 132 , 139 ) ; Size = MAP_APPFONT ( 116 , 10 ) ; diff --git a/cui/source/tabpages/transfrm.src b/cui/source/tabpages/transfrm.src index 5e57d5742..d8960137a 100644 --- a/cui/source/tabpages/transfrm.src +++ b/cui/source/tabpages/transfrm.src @@ -61,6 +61,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE }; MetricField MTR_FLD_POS_X { + HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_X"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 14 + 8 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; @@ -76,6 +77,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE }; MetricField MTR_FLD_POS_Y { + HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 30 + 8 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; @@ -127,6 +129,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE }; MetricField MTR_FLD_WIDTH { + HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_WIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 14 + 61 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; @@ -142,6 +145,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE }; MetricField MTR_FLD_HEIGHT { + HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_HEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 30 + 61 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; @@ -172,6 +176,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE }; CheckBox CBX_SCALE { + HelpID = "cui:CheckBox:RID_SVXPAGE_POSITION_SIZE:CBX_SCALE"; Pos = MAP_APPFONT ( 12 , 47 + 61 ) ; Size = MAP_APPFONT ( 162 , 10 ) ; TabStop = TRUE ; @@ -189,6 +194,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE TriStateBox TSB_POSPROTECT { + HelpID = "cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_POSPROTECT"; Pos = MAP_APPFONT ( 12 , 10 + 120 ) ; Size = MAP_APPFONT ( 113 , 10 ) ; Text [ en-US ] = "Position" ; @@ -197,6 +203,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE TriStateBox TSB_SIZEPROTECT { + HelpID = "cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_SIZEPROTECT"; Pos = MAP_APPFONT ( 12 , 24 + 120 ) ; Size = MAP_APPFONT ( 113 , 10 ) ; Text [ en-US ] = "~Size" ; @@ -213,6 +220,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE }; TriStateBox TSB_AUTOGROW_WIDTH { + HelpID = "cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_WIDTH"; Pos = MAP_APPFONT ( 12 + 121 + 8, 10 + 120 ) ; Size = MAP_APPFONT ( 113 , 10 ) ; Text [ en-US ] = "~Fit width to text" ; @@ -220,6 +228,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE }; TriStateBox TSB_AUTOGROW_HEIGHT { + HelpID = "cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_HEIGHT"; Pos = MAP_APPFONT ( 12 + 121 + 8, 24 + 120 ) ; Size = MAP_APPFONT ( 113 , 10 ) ; Text [ en-US ] = "Fit ~height to text" ; @@ -251,6 +260,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE }; ListBox LB_ANCHOR { + HelpID = "cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ANCHOR"; Pos = MAP_APPFONT ( 46 + 121 + 16 , 8 + 120 ) ; Size = MAP_APPFONT ( 54 , 60 ) ; Hide = TRUE ; @@ -272,6 +282,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE }; ListBox LB_ORIENT { + HelpID = "cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ORIENT"; Pos = MAP_APPFONT ( 46 + 121 + 16 , 22 + 120 ); Size = MAP_APPFONT ( 54 , 60 ) ; Hide = TRUE ; @@ -319,6 +330,7 @@ TabPage RID_SVXPAGE_ANGLE }; MetricField MTR_FLD_POS_X { + HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 14 + 11 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; @@ -334,6 +346,7 @@ TabPage RID_SVXPAGE_ANGLE }; MetricField MTR_FLD_POS_Y { + HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 30 + 11 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; @@ -376,6 +389,7 @@ TabPage RID_SVXPAGE_ANGLE }; MetricField MTR_FLD_ANGLE { + HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 82 + 22 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; @@ -427,6 +441,7 @@ TabPage RID_SVXPAGE_SLANT }; MetricField MTR_FLD_RADIUS { + HelpID = "cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 14 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; @@ -454,6 +469,7 @@ TabPage RID_SVXPAGE_SLANT }; MetricField MTR_FLD_ANGLE { + HelpID = "cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 46 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; diff --git a/embedserv/prj/d.lst b/embedserv/prj/d.lst index 3765f7d97..e01fbabf8 100755 --- a/embedserv/prj/d.lst +++ b/embedserv/prj/d.lst @@ -1 +1,2 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll +..\%__SRC%\misc\emser.component %_DEST%\xml%_EXT%\emser.component diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx index d0cacf2e9..6045c40fa 100755 --- a/embedserv/source/embed/register.cxx +++ b/embedserv/source/embed/register.cxx @@ -95,34 +95,6 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServic return pRet; } -sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) ); - - uno::Reference< registry::XRegistryKey > xNewKey; - - xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + - EmbedServer_getImplementationName() + - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - - uno::Sequence< ::rtl::OUString > rServices = EmbedServer_getSupportedServiceNames(); - for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ ) - xNewKey->createKey( rServices.getConstArray()[ind] ); - - return sal_True; - } - catch (registry::InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - return sal_False; -} - } // extern "C" // Fix strange warnings about some @@ -130,4 +102,4 @@ sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegis // warning C4505: 'xxx' : unreferenced local function has been removed #if defined(_MSC_VER) #pragma warning(disable: 4505) -#endif
\ No newline at end of file +#endif diff --git a/embedserv/util/emser.component b/embedserv/util/emser.component new file mode 100644 index 000000000..682ad1c31 --- /dev/null +++ b/embedserv/util/emser.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.ole.EmbedServer"> + <service name="com.sun.star.document.OleEmbeddedServerRegistration"/> + </implementation> +</component> diff --git a/embedserv/util/exports.dxp b/embedserv/util/exports.dxp index 9630d7e06..f0e1c6993 100755 --- a/embedserv/util/exports.dxp +++ b/embedserv/util/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/embedserv/util/makefile.mk b/embedserv/util/makefile.mk index 45e3e4698..5af210d96 100755 --- a/embedserv/util/makefile.mk +++ b/embedserv/util/makefile.mk @@ -94,3 +94,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : target.mk + +ALLTAR : $(MISC)/emser.component + +$(MISC)/emser.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + emser.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt emser.component diff --git a/extensions/inc/abpilot.hrc b/extensions/inc/abpilot.hrc index aea77a3f3..88d5cc17c 100644 --- a/extensions/inc/abpilot.hrc +++ b/extensions/inc/abpilot.hrc @@ -27,19 +27,11 @@ #ifndef EXTENSIONS_ABPILOT_HRC #define EXTENSIONS_ABPILOT_HRC -#include "extensio.hrc" - -#define HID_ABSPILOT_PREVIOUS ( HID_ABP_START + 0) -#define HID_ABSPILOT_NEXT ( HID_ABP_START + 1) -#define HID_ABSPILOT_CANCEL ( HID_ABP_START + 2) -#define HID_ABSPILOT_FINISH ( HID_ABP_START + 3) -#define UID_ABSPILOT_HELP ( HID_ABP_START + 4) -#define HID_ABSPILOT ( HID_ABP_START + 5) - // !! if you add new IDs, please also adjust HID_ABP_LAST below !! -#define HID_ABP_LAST HID_ABSPILOT - -#if HID_ABP_LAST > HID_ABP_END - #error help id range overflow (ABP) -#endif +#define HID_ABSPILOT_PREVIOUS "EXTENSIONS_HID_ABSPILOT_PREVIOUS" +#define HID_ABSPILOT_NEXT "EXTENSIONS_HID_ABSPILOT_NEXT" +#define HID_ABSPILOT_CANCEL "EXTENSIONS_HID_ABSPILOT_CANCEL" +#define HID_ABSPILOT_FINISH "EXTENSIONS_HID_ABSPILOT_FINISH" +#define UID_ABSPILOT_HELP "EXTENSIONS_UID_ABSPILOT_HELP" +#define HID_ABSPILOT "EXTENSIONS_HID_ABSPILOT" #endif // EXTENSIONS_ABPILOT_HRC diff --git a/extensions/inc/bibliography.hrc b/extensions/inc/bibliography.hrc index 90372fc0b..52a6694e9 100644 --- a/extensions/inc/bibliography.hrc +++ b/extensions/inc/bibliography.hrc @@ -27,60 +27,52 @@ #ifndef EXTENSIONS_BIBLIOGRAPHY_HRC #define EXTENSIONS_BIBLIOGRAPHY_HRC -#include "extensio.hrc" - -#define HID_BIB_CHANGESOURCE ( HID_BIBLIO_START + 0) -#define HID_BIB_MAPPINGDLG ( HID_BIBLIO_START + 1) -#define HID_BIB_TBX_TABLE ( HID_BIBLIO_START + 2) -#define HID_BIB_TBX_SEARCH ( HID_BIBLIO_START + 3) -#define HID_BIB_TBX_AUTOFILTER ( HID_BIBLIO_START + 4) -#define HID_BIB_IDENTIFIER_POS ( HID_BIBLIO_START + 5) -#define HID_BIB_AUTHORITYTYPE_POS ( HID_BIBLIO_START + 6) -#define HID_BIB_AUTHOR_POS ( HID_BIBLIO_START + 7) -#define HID_BIB_TITLE_POS ( HID_BIBLIO_START + 8) -#define HID_BIB_YEAR_POS ( HID_BIBLIO_START + 9) -#define HID_BIB_ISBN_POS ( HID_BIBLIO_START + 10) -#define HID_BIB_BOOKTITLE_POS ( HID_BIBLIO_START + 11) -#define HID_BIB_CHAPTER_POS ( HID_BIBLIO_START + 12) -#define HID_BIB_EDITION_POS ( HID_BIBLIO_START + 13) -#define HID_BIB_EDITOR_POS ( HID_BIBLIO_START + 14) -#define HID_BIB_HOWPUBLISHED_POS ( HID_BIBLIO_START + 15) -#define HID_BIB_INSTITUTION_POS ( HID_BIBLIO_START + 16) -#define HID_BIB_JOURNAL_POS ( HID_BIBLIO_START + 17) -#define HID_BIB_MONTH_POS ( HID_BIBLIO_START + 18) -#define HID_BIB_NOTE_POS ( HID_BIBLIO_START + 19) -#define HID_BIB_ANNOTE_POS ( HID_BIBLIO_START + 20) -#define HID_BIB_NUMBER_POS ( HID_BIBLIO_START + 21) -#define HID_BIB_ORGANIZATIONS_POS ( HID_BIBLIO_START + 22) -#define HID_BIB_PAGES_POS ( HID_BIBLIO_START + 23) -#define HID_BIB_PUBLISHER_POS ( HID_BIBLIO_START + 24) -#define HID_BIB_ADDRESS_POS ( HID_BIBLIO_START + 25) -#define HID_BIB_SCHOOL_POS ( HID_BIBLIO_START + 26) -#define HID_BIB_SERIES_POS ( HID_BIBLIO_START + 27) -#define HID_BIB_REPORTTYPE_POS ( HID_BIBLIO_START + 28) -#define HID_BIB_VOLUME_POS ( HID_BIBLIO_START + 29) -#define HID_BIB_URL_POS ( HID_BIBLIO_START + 30) -#define HID_BIB_CUSTOM1_POS ( HID_BIBLIO_START + 31) -#define HID_BIB_CUSTOM2_POS ( HID_BIBLIO_START + 32) -#define HID_BIB_CUSTOM3_POS ( HID_BIBLIO_START + 33) -#define HID_BIB_CUSTOM4_POS ( HID_BIBLIO_START + 34) -#define HID_BIB_CUSTOM5_POS ( HID_BIBLIO_START + 35) -#define HID_BIB_DB_TBX ( HID_BIBLIO_START + 36) -#define HID_BIB_DB_GHIDCTRL ( HID_BIBLIO_START + 37) -#define HID_BIB_CONTROL_PAGE ( HID_BIBLIO_START + 38) -#define HID_BIB_CONTROL_PARENT ( HID_BIBLIO_START + 39) -#define UID_BIB_FRAME_WINDOW ( HID_BIBLIO_START + 40) -#define HID_BIB_DELETE_RECORD ( HID_BIBLIO_START + 41) -#define HID_BIB_INSERT_RECORD ( HID_BIBLIO_START + 42) -#define HID_BIB_DB_GRIDCTRL ( HID_BIBLIO_START + 43) -#define HID_DLG_MAPPING ( HID_BIBLIO_START + 44) -#define HID_DLG_DBCHANGE ( HID_BIBLIO_START + 45) -#define HID_SELECTION_TLB ( HID_BIBLIO_START + 46) - // !! if you add new IDs, please also adjust HID_ABP_LAST below !! -#define HID_BIB_LAST HID_SELECTION_TLB - -#if HID_BIB_LAST > HID_BIBLIO_END - #error help id range overflow (BIBLIO) -#endif +#define HID_BIB_CHANGESOURCE "EXTENSIONS_HID_BIB_CHANGESOURCE" +#define HID_BIB_MAPPINGDLG "EXTENSIONS_HID_BIB_MAPPINGDLG" +#define HID_BIB_TBX_TABLE "EXTENSIONS_HID_BIB_TBX_TABLE" +#define HID_BIB_TBX_SEARCH "EXTENSIONS_HID_BIB_TBX_SEARCH" +#define HID_BIB_TBX_AUTOFILTER "EXTENSIONS_HID_BIB_TBX_AUTOFILTER" +#define HID_BIB_IDENTIFIER_POS "EXTENSIONS_HID_BIB_IDENTIFIER_POS" +#define HID_BIB_AUTHORITYTYPE_POS "EXTENSIONS_HID_BIB_AUTHORITYTYPE_POS" +#define HID_BIB_AUTHOR_POS "EXTENSIONS_HID_BIB_AUTHOR_POS" +#define HID_BIB_TITLE_POS "EXTENSIONS_HID_BIB_TITLE_POS" +#define HID_BIB_YEAR_POS "EXTENSIONS_HID_BIB_YEAR_POS" +#define HID_BIB_ISBN_POS "EXTENSIONS_HID_BIB_ISBN_POS" +#define HID_BIB_BOOKTITLE_POS "EXTENSIONS_HID_BIB_BOOKTITLE_POS" +#define HID_BIB_CHAPTER_POS "EXTENSIONS_HID_BIB_CHAPTER_POS" +#define HID_BIB_EDITION_POS "EXTENSIONS_HID_BIB_EDITION_POS" +#define HID_BIB_EDITOR_POS "EXTENSIONS_HID_BIB_EDITOR_POS" +#define HID_BIB_HOWPUBLISHED_POS "EXTENSIONS_HID_BIB_HOWPUBLISHED_POS" +#define HID_BIB_INSTITUTION_POS "EXTENSIONS_HID_BIB_INSTITUTION_POS" +#define HID_BIB_JOURNAL_POS "EXTENSIONS_HID_BIB_JOURNAL_POS" +#define HID_BIB_MONTH_POS "EXTENSIONS_HID_BIB_MONTH_POS" +#define HID_BIB_NOTE_POS "EXTENSIONS_HID_BIB_NOTE_POS" +#define HID_BIB_ANNOTE_POS "EXTENSIONS_HID_BIB_ANNOTE_POS" +#define HID_BIB_NUMBER_POS "EXTENSIONS_HID_BIB_NUMBER_POS" +#define HID_BIB_ORGANIZATIONS_POS "EXTENSIONS_HID_BIB_ORGANIZATIONS_POS" +#define HID_BIB_PAGES_POS "EXTENSIONS_HID_BIB_PAGES_POS" +#define HID_BIB_PUBLISHER_POS "EXTENSIONS_HID_BIB_PUBLISHER_POS" +#define HID_BIB_ADDRESS_POS "EXTENSIONS_HID_BIB_ADDRESS_POS" +#define HID_BIB_SCHOOL_POS "EXTENSIONS_HID_BIB_SCHOOL_POS" +#define HID_BIB_SERIES_POS "EXTENSIONS_HID_BIB_SERIES_POS" +#define HID_BIB_REPORTTYPE_POS "EXTENSIONS_HID_BIB_REPORTTYPE_POS" +#define HID_BIB_VOLUME_POS "EXTENSIONS_HID_BIB_VOLUME_POS" +#define HID_BIB_URL_POS "EXTENSIONS_HID_BIB_URL_POS" +#define HID_BIB_CUSTOM1_POS "EXTENSIONS_HID_BIB_CUSTOM1_POS" +#define HID_BIB_CUSTOM2_POS "EXTENSIONS_HID_BIB_CUSTOM2_POS" +#define HID_BIB_CUSTOM3_POS "EXTENSIONS_HID_BIB_CUSTOM3_POS" +#define HID_BIB_CUSTOM4_POS "EXTENSIONS_HID_BIB_CUSTOM4_POS" +#define HID_BIB_CUSTOM5_POS "EXTENSIONS_HID_BIB_CUSTOM5_POS" +#define HID_BIB_DB_TBX "EXTENSIONS_HID_BIB_DB_TBX" +#define HID_BIB_DB_GHIDCTRL "EXTENSIONS_HID_BIB_DB_GHIDCTRL" +#define HID_BIB_CONTROL_PAGE "EXTENSIONS_HID_BIB_CONTROL_PAGE" +#define HID_BIB_CONTROL_PARENT "EXTENSIONS_HID_BIB_CONTROL_PARENT" +#define UID_BIB_FRAME_WINDOW "EXTENSIONS_UID_BIB_FRAME_WINDOW" +#define HID_BIB_DELETE_RECORD "EXTENSIONS_HID_BIB_DELETE_RECORD" +#define HID_BIB_INSERT_RECORD "EXTENSIONS_HID_BIB_INSERT_RECORD" +#define HID_BIB_DB_GRIDCTRL "EXTENSIONS_HID_BIB_DB_GRIDCTRL" +#define HID_DLG_MAPPING "EXTENSIONS_HID_DLG_MAPPING" +#define HID_DLG_DBCHANGE "EXTENSIONS_HID_DLG_DBCHANGE" +#define HID_SELECTION_TLB "EXTENSIONS_HID_SELECTION_TLB" #endif // EXTENSIONS_BIBLIOGRAPHY_HRC diff --git a/extensions/inc/dbpilots.hrc b/extensions/inc/dbpilots.hrc index 38a47138c..3a7f3e695 100644 --- a/extensions/inc/dbpilots.hrc +++ b/extensions/inc/dbpilots.hrc @@ -27,29 +27,21 @@ #ifndef EXTENSIONS_DBPILOT_HRC #define EXTENSIONS_DBPILOT_HRC -#include "extensio.hrc" - -#define HID_GHIDWIZARD_PREVIOUS ( HID_DBP_START + 0) -#define HID_GHIDWIZARD_NEXT ( HID_DBP_START + 1) -#define HID_GHIDWIZARD_CANCEL ( HID_DBP_START + 2) -#define HID_GHIDWIZARD_FINISH ( HID_DBP_START + 3) -#define HID_GROUPWIZARD_PREVIOUS ( HID_DBP_START + 4) -#define HID_GROUPWIZARD_NEXT ( HID_DBP_START + 5) -#define HID_GROUPWIZARD_CANCEL ( HID_DBP_START + 6) -#define HID_GROUPWIZARD_FINISH ( HID_DBP_START + 7) -#define HID_LISTWIZARD_PREVIOUS ( HID_DBP_START + 8) -#define HID_LISTWIZARD_NEXT ( HID_DBP_START + 9) -#define HID_LISTWIZARD_CANCEL ( HID_DBP_START + 10) -#define HID_LISTWIZARD_FINISH ( HID_DBP_START + 11) -#define HID_GRIDWIZARD_PREVIOUS ( HID_DBP_START + 12) -#define HID_GRIDWIZARD_NEXT ( HID_DBP_START + 13) -#define HID_GRIDWIZARD_CANCEL ( HID_DBP_START + 14) -#define HID_GRIDWIZARD_FINISH ( HID_DBP_START + 15) - // !! if you add new IDs, please also adjust HID_ABP_LAST below !! -#define HID_DBP_LAST HID_GRIDWIZARD_FINISH - -#if HID_DBP_LAST > HID_DBP_END - #error help id range overflow (DBP) -#endif +#define HID_GHIDWIZARD_PREVIOUS "EXTENSIONS_HID_GHIDWIZARD_PREVIOUS" +#define HID_GHIDWIZARD_NEXT "EXTENSIONS_HID_GHIDWIZARD_NEXT" +#define HID_GHIDWIZARD_CANCEL "EXTENSIONS_HID_GHIDWIZARD_CANCEL" +#define HID_GHIDWIZARD_FINISH "EXTENSIONS_HID_GHIDWIZARD_FINISH" +#define HID_GROUPWIZARD_PREVIOUS "EXTENSIONS_HID_GROUPWIZARD_PREVIOUS" +#define HID_GROUPWIZARD_NEXT "EXTENSIONS_HID_GROUPWIZARD_NEXT" +#define HID_GROUPWIZARD_CANCEL "EXTENSIONS_HID_GROUPWIZARD_CANCEL" +#define HID_GROUPWIZARD_FINISH "EXTENSIONS_HID_GROUPWIZARD_FINISH" +#define HID_LISTWIZARD_PREVIOUS "EXTENSIONS_HID_LISTWIZARD_PREVIOUS" +#define HID_LISTWIZARD_NEXT "EXTENSIONS_HID_LISTWIZARD_NEXT" +#define HID_LISTWIZARD_CANCEL "EXTENSIONS_HID_LISTWIZARD_CANCEL" +#define HID_LISTWIZARD_FINISH "EXTENSIONS_HID_LISTWIZARD_FINISH" +#define HID_GRIDWIZARD_PREVIOUS "EXTENSIONS_HID_GRIDWIZARD_PREVIOUS" +#define HID_GRIDWIZARD_NEXT "EXTENSIONS_HID_GRIDWIZARD_NEXT" +#define HID_GRIDWIZARD_CANCEL "EXTENSIONS_HID_GRIDWIZARD_CANCEL" +#define HID_GRIDWIZARD_FINISH "EXTENSIONS_HID_GRIDWIZARD_FINISH" #endif // EXTENSIONS_DBPILOT_HRC diff --git a/extensions/inc/propctrlr.hrc b/extensions/inc/propctrlr.hrc index a559b3081..b2888b982 100644 --- a/extensions/inc/propctrlr.hrc +++ b/extensions/inc/propctrlr.hrc @@ -27,311 +27,304 @@ #ifndef EXTENSIONS_PROPCTRLR_HRC #define EXTENSIONS_PROPCTRLR_HRC -#include "extensio.hrc" +#define UID_PROP_DLG_FONT_TYPE "EXTENSIONS_UID_PROP_DLG_FONT_TYPE" +#define UID_PROP_DLG_IMAGE_URL "EXTENSIONS_UID_PROP_DLG_IMAGE_URL" +#define UID_PROP_DLG_BACKGROUNDCOLOR "EXTENSIONS_UID_PROP_DLG_BACKGROUNDCOLOR" +#define UID_PROP_DLG_SYMBOLCOLOR "EXTENSIONS_UID_PROP_DLG_SYMBOLCOLOR" +#define UID_PROP_DLG_ATTR_DATASOURCE "EXTENSIONS_UID_PROP_DLG_ATTR_DATASOURCE" +#define UID_PROP_DLG_ATTR_TARGET_URL "EXTENSIONS_UID_PROP_DLG_ATTR_TARGET_URL" +#define UID_PROP_DLG_NUMBER_FORMAT "EXTENSIONS_UID_PROP_DLG_NUMBER_FORMAT" +#define UID_PROP_DLG_CONTROLLABEL "EXTENSIONS_UID_PROP_DLG_CONTROLLABEL" +#define UID_PROP_DLG_FILLCOLOR "EXTENSIONS_UID_PROP_DLG_FILLCOLOR" +#define UID_PROP_DLG_TABINDEX "EXTENSIONS_UID_PROP_DLG_TABINDEX" +#define UID_PROP_DLG_SQLCOMMAND "EXTENSIONS_UID_PROP_DLG_SQLCOMMAND" +#define UID_PROP_DLG_FORMLINKFIELDS "EXTENSIONS_UID_PROP_DLG_FORMLINKFIELDS" +#define UID_PROP_DLG_FILTER "EXTENSIONS_UID_PROP_DLG_FILTER" +#define UID_PROP_DLG_ORDER "EXTENSIONS_UID_PROP_DLG_ORDER" +#define UID_PROP_DLG_SELECTION "EXTENSIONS_UID_PROP_DLG_SELECTION" +#define UID_PROP_DLG_BIND_EXPRESSION "EXTENSIONS_UID_PROP_DLG_BIND_EXPRESSION" +#define UID_PROP_DLG_XSD_REQUIRED "EXTENSIONS_UID_PROP_DLG_XSD_REQUIRED" +#define UID_PROP_DLG_XSD_RELEVANT "EXTENSIONS_UID_PROP_DLG_XSD_RELEVANT" +#define UID_PROP_DLG_XSD_READONLY "EXTENSIONS_UID_PROP_DLG_XSD_READONLY" +#define UID_PROP_DLG_XSD_CONSTRAINT "EXTENSIONS_UID_PROP_DLG_XSD_CONSTRAINT" +#define UID_PROP_DLG_XSD_CALCULATION "EXTENSIONS_UID_PROP_DLG_XSD_CALCULATION" +#define UID_PROP_ADD_DATA_TYPE "EXTENSIONS_UID_PROP_ADD_DATA_TYPE" +#define UID_PROP_REMOVE_DATA_TYPE "EXTENSIONS_UID_PROP_REMOVE_DATA_TYPE" +#define UID_PROP_DLG_BORDERCOLOR "EXTENSIONS_UID_PROP_DLG_BORDERCOLOR" -#define HID_PROP_INPUT_REQUIRED ( HID_PROPC_START + 0) -#define HID_PROP_GROUPBOX ( HID_PROPC_START + 1) -#define HID_PROP_CONTROLSOURCE ( HID_PROPC_START + 2) -#define HID_PROP_NAME ( HID_PROPC_START + 3) -#define HID_PROP_TABINDEX ( HID_PROPC_START + 4) -#define HID_PROP_MASTERFIELDS ( HID_PROPC_START + 5) -#define HID_PROP_SLAVEFIELDS ( HID_PROPC_START + 6) -#define HID_PROP_DATASOURCE ( HID_PROPC_START + 7) -#define HID_PROP_CURSORSOURCE ( HID_PROPC_START + 8) -#define HID_PROP_CURSORSOURCETYPE ( HID_PROPC_START + 9) -#define HID_PROP_CURSORTYPE ( HID_PROPC_START + 10) -#define HID_PROP_READONLY ( HID_PROPC_START + 11) -#define HID_PROP_DATAENTRY ( HID_PROPC_START + 12) -#define HID_PROP_NAVIGATION ( HID_PROPC_START + 13) -#define HID_PROP_CYCLE ( HID_PROPC_START + 14) -#define HID_PROP_ALLOW_ADDITIONS ( HID_PROPC_START + 15) -#define HID_PROP_ALLOW_EDITS ( HID_PROPC_START + 16) -#define HID_PROP_ALLOW_DELETIONS ( HID_PROPC_START + 17) -#define HID_PROP_DIRTY ( HID_PROPC_START + 18) -#define HID_PROP_OLDVALUE ( HID_PROPC_START + 19) -#define HID_PROP_VALUE ( HID_PROPC_START + 20) -#define HID_PROP_LOCKED ( HID_PROPC_START + 21) -#define HID_PROP_FORMATKEY ( HID_PROPC_START + 22) -#define HID_PROP_REQUIRED ( HID_PROPC_START + 23) -#define HID_PROP_WHEEL_BEHAVIOR ( HID_PROPC_START + 24) -#define HID_PROP_UNIQUE ( HID_PROPC_START + 25) -#define HID_PROP_CLASSID ( HID_PROPC_START + 26) -#define HID_PROP_LEFT ( HID_PROPC_START + 27) -#define HID_PROP_RIGHT ( HID_PROPC_START + 28) -#define HID_PROP_HEIGHT ( HID_PROPC_START + 29) -#define HID_PROP_WIDTH ( HID_PROPC_START + 30) -#define HID_PROP_BOUNDCOLUMN ( HID_PROPC_START + 31) -#define HID_PROP_LISTSOURCETYPE ( HID_PROPC_START + 32) -#define HID_PROP_LISTSOURCE ( HID_PROPC_START + 33) -#define HID_PROP_LISTINDEX ( HID_PROPC_START + 34) -#define HID_PROP_TEXT ( HID_PROPC_START + 35) -#define HID_PROP_LABEL ( HID_PROPC_START + 36) -#define HID_PROP_STRINGITEMLIST ( HID_PROPC_START + 37) -#define HID_PROP_SEARCHING ( HID_PROPC_START + 38) -#define HID_PROP_FONT ( HID_PROPC_START + 39) -#define HID_PROP_ROWHEIGHT ( HID_PROPC_START + 40) -#define HID_PROP_BACKGROUNDCOLOR ( HID_PROPC_START + 41) -#define HID_PROP_FILLCOLOR ( HID_PROPC_START + 42) -#define HID_PROP_LINECOLOR ( HID_PROPC_START + 43) -#define HID_PROP_BORDER ( HID_PROPC_START + 44) -#define HID_PROP_ALIGN ( HID_PROPC_START + 45) -#define HID_PROP_DROPDOWN ( HID_PROPC_START + 46) -#define HID_PROP_MULTILINE ( HID_PROPC_START + 47) -#define HID_PROP_HSCROLL ( HID_PROPC_START + 48) -#define HID_PROP_VSCROLL ( HID_PROPC_START + 49) -#define HID_PROP_TABSTOP ( HID_PROPC_START + 50) -#define HID_PROP_REFVALUE ( HID_PROPC_START + 51) -#define HID_PROP_BUTTONTYPE ( HID_PROPC_START + 52) -#define HID_PROP_SUBMIT_ACTION ( HID_PROPC_START + 53) -#define HID_PROP_SUBMIT_METHOD ( HID_PROPC_START + 54) -#define HID_PROP_SUBMIT_ENCODING ( HID_PROPC_START + 55) -#define HID_PROP_DEFAULTVALUE ( HID_PROPC_START + 56) -#define HID_PROP_SUBMIT_TARGET ( HID_PROPC_START + 57) -#define HID_PROP_DEFAULT_STATE ( HID_PROPC_START + 58) -#define HID_PROP_IMAGE_URL ( HID_PROPC_START + 59) -#define HID_PROP_DEFAULT_SELECT_SEQ ( HID_PROPC_START + 60) -#define HID_PROP_MULTISELECTION ( HID_PROPC_START + 61) -#define HID_PROP_DATE ( HID_PROPC_START + 62) -#define HID_PROP_DATEMIN ( HID_PROPC_START + 63) -#define HID_PROP_DATEMAX ( HID_PROPC_START + 64) -#define HID_PROP_DATEFORMAT ( HID_PROPC_START + 65) -#define HID_PROP_TIME ( HID_PROPC_START + 66) -#define HID_PROP_TIMEMIN ( HID_PROPC_START + 67) -#define HID_PROP_TIMEMAX ( HID_PROPC_START + 68) -#define HID_PROP_TIMEFORMAT ( HID_PROPC_START + 69) -#define HID_PROP_VALUEMIN ( HID_PROPC_START + 70) -#define HID_PROP_VALUEMAX ( HID_PROPC_START + 71) -#define HID_PROP_VALUESTEP ( HID_PROPC_START + 72) -#define HID_PROP_CURRENCYSYMBOL ( HID_PROPC_START + 73) -#define HID_PROP_EDITMASK ( HID_PROPC_START + 74) -#define HID_PROP_LITERALMASK ( HID_PROPC_START + 75) -#define HID_PROP_ENABLED ( HID_PROPC_START + 76) -#define HID_PROP_AUTOCOMPLETE ( HID_PROPC_START + 77) -#define HID_PROP_LINECOUNT ( HID_PROPC_START + 78) -#define HID_PROP_MAXTEXTLEN ( HID_PROPC_START + 79) -#define HID_PROP_SPIN ( HID_PROPC_START + 80) -#define HID_PROP_STRICTFORMAT ( HID_PROPC_START + 81) -#define HID_PROP_SHOWTHOUSANDSEP ( HID_PROPC_START + 82) -#define HID_PROP_VERTICAL_ALIGN ( HID_PROPC_START + 83) -#define HID_PROP_PRINTABLE ( HID_PROPC_START + 84) -#define HID_PROP_TARGET_URL ( HID_PROPC_START + 85) -#define HID_PROP_TARGET_FRAME ( HID_PROPC_START + 86) -#define HID_PROP_TAG ( HID_PROPC_START + 87) -#define HID_PROP_ECHO_CHAR ( HID_PROPC_START + 88) -#define HID_PROP_EMPTY_IS_NULL ( HID_PROPC_START + 89) -#define HID_PROP_DECIMAL_ACCURACY ( HID_PROPC_START + 90) -#define HID_PROP_ENABLE_VISIBLE ( HID_PROPC_START + 91) -#define HID_PROP_DEFAULT_BUTTON ( HID_PROPC_START + 92) -#define HID_PROP_HIDDEN_VALUE ( HID_PROPC_START + 93) -#define HID_PROP_TRISTATE ( HID_PROPC_START + 94) -#define HID_PROP_NAVIGATIONBAR ( HID_PROPC_START + 95) -#define HID_PROP_FILTER ( HID_PROPC_START + 96) -#define HID_PROP_SORT_CRITERIA ( HID_PROPC_START + 97) -#define HID_PROP_DEFAULT_LONG_VALUE ( HID_PROPC_START + 98) -#define HID_PROP_DEFAULT_TIME ( HID_PROPC_START + 99) -#define HID_PROP_DEFAULT_DATE ( HID_PROPC_START + 100) -#define HID_PROP_HELPTEXT ( HID_PROPC_START + 101) -#define HID_PROP_HELPURL ( HID_PROPC_START + 102) -#define HID_PROP_RECORDMARKER ( HID_PROPC_START + 103) -#define HID_PROP_FILTERPROPOSAL ( HID_PROPC_START + 104) -#define HID_PROP_EFFECTIVEMIN ( HID_PROPC_START + 105) -#define HID_PROP_EFFECTIVEMAX ( HID_PROPC_START + 106) -#define HID_PROP_EFFECTIVEDEFAULT ( HID_PROPC_START + 107) -#define HID_PROP_CONTROLLABEL ( HID_PROPC_START + 108) -#define HID_PROP_CURRSYM_POSITION ( HID_PROPC_START + 109) -#define HID_PROP_ESCAPE_PROCESSING ( HID_PROPC_START + 110) -#define HID_PROP_TITLE ( HID_PROPC_START + 111) -#define HID_PROP_STEP ( HID_PROPC_START + 112) -#define HID_PROP_PROGRESSVALUE ( HID_PROPC_START + 113) -#define HID_PROP_PROGRESSVALUE_MIN ( HID_PROPC_START + 114) -#define HID_PROP_PROGRESSVALUE_MAX ( HID_PROPC_START + 115) -#define HID_PROP_SCROLLVALUE ( HID_PROPC_START + 116) -#define HID_PROP_SCROLLVALUE_MAX ( HID_PROPC_START + 117) -#define HID_PROP_LINEINCREMENT ( HID_PROPC_START + 118) -#define HID_PROP_BLOCKINCREMENT ( HID_PROPC_START + 119) -#define HID_PROP_VISIBLESIZE ( HID_PROPC_START + 120) -#define HID_PROP_ORIENTATION ( HID_PROPC_START + 121) -#define HID_PROP_POSITIONX ( HID_PROPC_START + 122) -#define HID_PROP_POSITIONY ( HID_PROPC_START + 123) -#define HID_PROP_PUSHBUTTONTYPE ( HID_PROPC_START + 124) -#define HID_PROP_STATE ( HID_PROPC_START + 125) -#define HID_PROP_SCALEIMAGE ( HID_PROPC_START + 126) -#define HID_PROP_BOUND_CELL ( HID_PROPC_START + 127) -#define HID_PROP_LIST_CELL_RANGE ( HID_PROPC_START + 128) -#define HID_PROP_CELL_EXCHANGE_TYPE ( HID_PROPC_START + 129) -#define HID_PROP_SELECTEDITEMS ( HID_PROPC_START + 130) -#define HID_PROP_SCROLLVALUE_MIN ( HID_PROPC_START + 131) -#define HID_PROP_DEFAULT_SCROLLVALUE ( HID_PROPC_START + 132) -#define HID_PROP_REPEAT_DELAY ( HID_PROPC_START + 133) -#define HID_PROP_SYMBOLCOLOR ( HID_PROPC_START + 134) -#define HID_PROP_SPINVALUE ( HID_PROPC_START + 135) -#define HID_PROP_SPINVALUE_MIN ( HID_PROPC_START + 136) -#define HID_PROP_SPINVALUE_MAX ( HID_PROPC_START + 137) -#define HID_PROP_DEFAULT_SPINVALUE ( HID_PROPC_START + 138) -#define HID_PROP_SPININCREMENT ( HID_PROPC_START + 139) -#define HID_PROP_REPEAT ( HID_PROPC_START + 140) -#define HID_PROP_WORDBREAK ( HID_PROPC_START + 141) -#define HID_PROP_SHOW_SCROLLBARS ( HID_PROPC_START + 142) -#define HID_PROP_TABORDER_CONTROLS ( HID_PROPC_START + 143) -#define HID_FIELDLINK_DETAIL_COLUMN ( HID_PROPC_START + 144) -#define HID_FIELDLINK_MASTER_COLUMN ( HID_PROPC_START + 145) -#define UID_FIELDLINK_DETAIL1 ( HID_PROPC_START + 146) -#define UID_FIELDLINK_MASTER1 ( HID_PROPC_START + 147) -#define UID_FIELDLINK_DETAIL2 ( HID_PROPC_START + 148) -#define UID_FIELDLINK_MASTER2 ( HID_PROPC_START + 149) -#define UID_FIELDLINK_DETAIL3 ( HID_PROPC_START + 150) -#define UID_FIELDLINK_MASTER3 ( HID_PROPC_START + 151) -#define UID_FIELDLINK_DETAIL4 ( HID_PROPC_START + 152) -#define UID_FIELDLINK_MASTER4 ( HID_PROPC_START + 153) -#define HID_PROP_ICONSIZE ( HID_PROPC_START + 154) -#define HID_PROP_SHOW_POSITION ( HID_PROPC_START + 155) -#define HID_PROP_SHOW_NAVIGATION ( HID_PROPC_START + 156) -#define HID_PROP_SHOW_RECORDACTIONS ( HID_PROPC_START + 157) -#define HID_PROP_SHOW_FILTERSORT ( HID_PROPC_START + 158) -#define HID_PROP_AUTOLINEBREAK ( HID_PROPC_START + 159) -#define HID_PROP_TEXTTYPE ( HID_PROPC_START + 160) -#define HID_PROP_LINEEND_FORMAT ( HID_PROPC_START + 161) -#define HID_PROP_XSD_TOTAL_DIGITS ( HID_PROPC_START + 162) -#define HID_PROP_XSD_FRACTION_DIGITS ( HID_PROPC_START + 163) -#define HID_PROP_XSD_MAX_INCLUSIVE ( HID_PROPC_START + 164) -#define HID_PROP_XSD_MAX_EXCLUSIVE ( HID_PROPC_START + 165) -#define HID_PROP_XSD_MIN_INCLUSIVE ( HID_PROPC_START + 166) -#define HID_PROP_XSD_MIN_EXCLUSIVE ( HID_PROPC_START + 167) -#define HID_PROP_UNCHECKEDREFVALUE ( HID_PROPC_START + 168) -#define HID_PROP_SUBMISSION_ID ( HID_PROPC_START + 169) -#define UID_PROP_DLG_FONT_TYPE ( HID_PROPC_START + 170) -#define UID_PROP_DLG_IMAGE_URL ( HID_PROPC_START + 171) -#define UID_PROP_DLG_BACKGROUNDCOLOR ( HID_PROPC_START + 172) -#define UID_PROP_DLG_SYMBOLCOLOR ( HID_PROPC_START + 173) -#define UID_PROP_DLG_ATTR_DATASOURCE ( HID_PROPC_START + 174) -#define UID_PROP_DLG_ATTR_TARGET_URL ( HID_PROPC_START + 175) -#define UID_PROP_DLG_NUMBER_FORMAT ( HID_PROPC_START + 176) -#define UID_PROP_DLG_CONTROLLABEL ( HID_PROPC_START + 177) -#define UID_PROP_DLG_FILLCOLOR ( HID_PROPC_START + 178) -#define UID_PROP_DLG_TABINDEX ( HID_PROPC_START + 179) -#define UID_PROP_DLG_SQLCOMMAND ( HID_PROPC_START + 180) -#define UID_PROP_DLG_FORMLINKFIELDS ( HID_PROPC_START + 181) -#define UID_PROP_DLG_FILTER ( HID_PROPC_START + 182) -#define UID_PROP_DLG_ORDER ( HID_PROPC_START + 183) -#define UID_PROP_DLG_SELECTION ( HID_PROPC_START + 184) -#define UID_EVT_MACRODLG ( HID_PROPC_START + 185) -#define UID_BRWEVT_APPROVEACTIONPERFORMED ( HID_PROPC_START + 186) -#define UID_BRWEVT_ACTIONPERFORMED ( HID_PROPC_START + 187) -#define UID_BRWEVT_CHANGED ( HID_PROPC_START + 188) -#define UID_BRWEVT_TEXTCHANGED ( HID_PROPC_START + 189) -#define UID_BRWEVT_ITEMSTATECHANGED ( HID_PROPC_START + 190) -#define UID_BRWEVT_FOCUSGAINED ( HID_PROPC_START + 191) -#define UID_BRWEVT_FOCUSLOST ( HID_PROPC_START + 192) -#define UID_BRWEVT_KEYTYPED ( HID_PROPC_START + 193) -#define UID_BRWEVT_KEYUP ( HID_PROPC_START + 194) -#define UID_BRWEVT_MOUSEENTERED ( HID_PROPC_START + 195) -#define UID_BRWEVT_MOUSEDRAGGED ( HID_PROPC_START + 196) -#define UID_BRWEVT_MOUSEMOVED ( HID_PROPC_START + 197) -#define UID_BRWEVT_MOUSEPRESSED ( HID_PROPC_START + 198) -#define UID_BRWEVT_MOUSERELEASED ( HID_PROPC_START + 199) -#define UID_BRWEVT_MOUSEEXITED ( HID_PROPC_START + 200) -#define UID_BRWEVT_APPROVERESETTED ( HID_PROPC_START + 201) -#define UID_BRWEVT_RESETTED ( HID_PROPC_START + 202) -#define UID_BRWEVT_SUBMITTED ( HID_PROPC_START + 203) -#define UID_BRWEVT_BEFOREUPDATE ( HID_PROPC_START + 204) -#define UID_BRWEVT_AFTERUPDATE ( HID_PROPC_START + 205) -#define UID_BRWEVT_LOADED ( HID_PROPC_START + 206) -#define UID_BRWEVT_RELOADING ( HID_PROPC_START + 207) -#define UID_BRWEVT_RELOADED ( HID_PROPC_START + 208) -#define UID_BRWEVT_UNLOADING ( HID_PROPC_START + 209) -#define UID_BRWEVT_UNLOADED ( HID_PROPC_START + 210) -#define UID_BRWEVT_CONFIRMDELETE ( HID_PROPC_START + 211) -#define UID_BRWEVT_APPROVEROWCHANGE ( HID_PROPC_START + 212) -#define UID_BRWEVT_ROWCHANGE ( HID_PROPC_START + 213) -#define UID_BRWEVT_POSITIONING ( HID_PROPC_START + 214) -#define UID_BRWEVT_POSITIONED ( HID_PROPC_START + 215) -#define UID_BRWEVT_APPROVEPARAMETER ( HID_PROPC_START + 216) -#define UID_BRWEVT_ERROROCCURED ( HID_PROPC_START + 217) -#define UID_BRWEVT_ADJUSTMENTVALUECHANGED ( HID_PROPC_START + 218) -#define HID_PROP_XML_DATA_MODEL ( HID_PROPC_START + 219) -#define HID_PROP_BIND_EXPRESSION ( HID_PROPC_START + 220) -#define HID_PROP_XSD_REQUIRED ( HID_PROPC_START + 221) -#define HID_PROP_XSD_RELEVANT ( HID_PROPC_START + 222) -#define HID_PROP_XSD_READONLY ( HID_PROPC_START + 223) -#define HID_PROP_XSD_CONSTRAINT ( HID_PROPC_START + 224) -#define HID_PROP_XSD_CALCULATION ( HID_PROPC_START + 225) -#define HID_PROP_XSD_DATA_TYPE ( HID_PROPC_START + 226) -#define HID_PROP_XSD_WHITESPACES ( HID_PROPC_START + 227) -#define HID_PROP_XSD_PATTERN ( HID_PROPC_START + 228) -#define HID_PROP_XSD_LENGTH ( HID_PROPC_START + 229) -#define HID_PROP_XSD_MIN_LENGTH ( HID_PROPC_START + 230) -#define HID_PROP_XSD_MAX_LENGTH ( HID_PROPC_START + 231) -#define UID_PROP_DLG_BIND_EXPRESSION ( HID_PROPC_START + 232) -#define UID_PROP_DLG_XSD_REQUIRED ( HID_PROPC_START + 233) -#define UID_PROP_DLG_XSD_RELEVANT ( HID_PROPC_START + 234) -#define UID_PROP_DLG_XSD_READONLY ( HID_PROPC_START + 235) -#define UID_PROP_DLG_XSD_CONSTRAINT ( HID_PROPC_START + 236) -#define UID_PROP_DLG_XSD_CALCULATION ( HID_PROPC_START + 237) -#define UID_PROP_ADD_DATA_TYPE ( HID_PROPC_START + 238) -#define UID_PROP_REMOVE_DATA_TYPE ( HID_PROPC_START + 239) -#define HID_PROP_LIST_BINDING ( HID_PROPC_START + 240) -#define HID_PROP_BINDING_NAME ( HID_PROPC_START + 241) -#define HID_PROP_SELECTION_TYPE ( HID_PROPC_START + 242) -#define HID_PROP_ROOT_DISPLAYED ( HID_PROPC_START + 243) -#define HID_PROP_SHOWS_HANDLES ( HID_PROPC_START + 244) -#define HID_PROP_SHOWS_ROOT_HANDLES ( HID_PROPC_START + 245) -#define HID_PROP_EDITABLE ( HID_PROPC_START + 246) -#define HID_PROP_INVOKES_STOP_NOT_EDITING ( HID_PROPC_START + 247) -#define HID_PROP_ROW_HEIGHT ( HID_PROPC_START + 248) -#define HID_PROP_DECORATION ( HID_PROPC_START + 249) -#define HID_EVT_ACTIONPERFORMED ( HID_PROPC_START + 250) -#define HID_EVT_AFTERUPDATE ( HID_PROPC_START + 251) -#define HID_EVT_BEFOREUPDATE ( HID_PROPC_START + 252) -#define HID_EVT_CONFIRMDELETE ( HID_PROPC_START + 253) -#define HID_EVT_ERROROCCURED ( HID_PROPC_START + 254) -#define HID_EVT_FOCUSGAINED ( HID_PROPC_START + 255) -#define HID_EVT_FOCUSLOST ( HID_PROPC_START + 256) -#define HID_EVT_ITEMSTATECHANGED ( HID_PROPC_START + 257) -#define HID_EVT_KEYTYPED ( HID_PROPC_START + 258) -#define HID_EVT_LOADED ( HID_PROPC_START + 259) -#define HID_EVT_MOUSEDRAGGED ( HID_PROPC_START + 260) -#define HID_EVT_MOUSEENTERED ( HID_PROPC_START + 261) -#define HID_EVT_MOUSEEXITED ( HID_PROPC_START + 262) -#define HID_EVT_MOUSEMOVED ( HID_PROPC_START + 263) -#define HID_EVT_MOUSEPRESSED ( HID_PROPC_START + 264) -#define HID_EVT_MOUSERELEASED ( HID_PROPC_START + 265) -#define HID_EVT_POSITIONED ( HID_PROPC_START + 266) -#define HID_EVT_RESETTED ( HID_PROPC_START + 267) -#define HID_EVT_SUBMITTED ( HID_PROPC_START + 268) -#define HID_EVT_TEXTCHANGED ( HID_PROPC_START + 269) -#define HID_EVT_UNLOADED ( HID_PROPC_START + 270) -#define HID_EVT_CHANGED ( HID_PROPC_START + 271) -#define HID_EVT_APPROVEACTIONPERFORMED ( HID_PROPC_START + 272) -#define HID_EVT_APPROVERESETTED ( HID_PROPC_START + 273) -#define HID_EVT_KEYUP ( HID_PROPC_START + 274) -#define HID_EVT_APPROVEPARAMETER ( HID_PROPC_START + 275) -#define HID_EVT_POSITIONING ( HID_PROPC_START + 276) -#define HID_EVT_RELOADED ( HID_PROPC_START + 277) -#define HID_EVT_APPROVEROWCHANGE ( HID_PROPC_START + 278) -#define HID_EVT_ROWCHANGE ( HID_PROPC_START + 279) -#define HID_EVT_RELOADING ( HID_PROPC_START + 280) -#define HID_EVT_UNLOADING ( HID_PROPC_START + 281) -#define HID_EVT_ADJUSTMENTVALUECHANGED ( HID_PROPC_START + 282) -#define HID_PROP_TOGGLE ( HID_PROPC_START + 283) -#define HID_PROP_FOCUSONCLICK ( HID_PROPC_START + 284) -#define HID_PROP_HIDEINACTIVESELECTION ( HID_PROPC_START + 285) -#define HID_PROP_VISUALEFFECT ( HID_PROPC_START + 286) -#define HID_PROP_BORDERCOLOR ( HID_PROPC_START + 287) -#define UID_PROP_DLG_BORDERCOLOR ( HID_PROPC_START + 288) -#define HID_PROP_IMAGEPOSITION ( HID_PROPC_START + 289) -#define HID_PROP_NOLABEL ( HID_PROPC_START + 290) -#define HID_PROP_WRITING_MODE ( HID_PROPC_START + 291) -#define HID_PROP_ANCHOR_TYPE ( HID_PROPC_START + 292) -#define HID_FM_PROPDLG_TABCTR ( HID_PROPC_START + 293) -#define HID_FM_PROPDLG_TAB_GENERAL ( HID_PROPC_START + 294) -#define HID_FM_PROPDLG_TAB_DATA ( HID_PROPC_START + 295) -#define HID_FM_PROPDLG_TAB_EVT ( HID_PROPC_START + 296) - // please adjust HID_LAST_PROPC_ID if you add new ids here! +#define UID_BRWEVT_APPROVEACTIONPERFORMED "EXTENSIONS_UID_BRWEVT_APPROVEACTIONPERFORMED" +#define UID_BRWEVT_ACTIONPERFORMED "EXTENSIONS_UID_BRWEVT_ACTIONPERFORMED" +#define UID_BRWEVT_CHANGED "EXTENSIONS_UID_BRWEVT_CHANGED" +#define UID_BRWEVT_TEXTCHANGED "EXTENSIONS_UID_BRWEVT_TEXTCHANGED" +#define UID_BRWEVT_ITEMSTATECHANGED "EXTENSIONS_UID_BRWEVT_ITEMSTATECHANGED" +#define UID_BRWEVT_FOCUSGAINED "EXTENSIONS_UID_BRWEVT_FOCUSGAINED" +#define UID_BRWEVT_FOCUSLOST "EXTENSIONS_UID_BRWEVT_FOCUSLOST" +#define UID_BRWEVT_KEYTYPED "EXTENSIONS_UID_BRWEVT_KEYTYPED" +#define UID_BRWEVT_KEYUP "EXTENSIONS_UID_BRWEVT_KEYUP" +#define UID_BRWEVT_MOUSEENTERED "EXTENSIONS_UID_BRWEVT_MOUSEENTERED" +#define UID_BRWEVT_MOUSEDRAGGED "EXTENSIONS_UID_BRWEVT_MOUSEDRAGGED" +#define UID_BRWEVT_MOUSEMOVED "EXTENSIONS_UID_BRWEVT_MOUSEMOVED" +#define UID_BRWEVT_MOUSEPRESSED "EXTENSIONS_UID_BRWEVT_MOUSEPRESSED" +#define UID_BRWEVT_MOUSERELEASED "EXTENSIONS_UID_BRWEVT_MOUSERELEASED" +#define UID_BRWEVT_MOUSEEXITED "EXTENSIONS_UID_BRWEVT_MOUSEEXITED" +#define UID_BRWEVT_APPROVERESETTED "EXTENSIONS_UID_BRWEVT_APPROVERESETTED" +#define UID_BRWEVT_RESETTED "EXTENSIONS_UID_BRWEVT_RESETTED" +#define UID_BRWEVT_SUBMITTED "EXTENSIONS_UID_BRWEVT_SUBMITTED" +#define UID_BRWEVT_BEFOREUPDATE "EXTENSIONS_UID_BRWEVT_BEFOREUPDATE" +#define UID_BRWEVT_AFTERUPDATE "EXTENSIONS_UID_BRWEVT_AFTERUPDATE" +#define UID_BRWEVT_LOADED "EXTENSIONS_UID_BRWEVT_LOADED" +#define UID_BRWEVT_RELOADING "EXTENSIONS_UID_BRWEVT_RELOADING" +#define UID_BRWEVT_RELOADED "EXTENSIONS_UID_BRWEVT_RELOADED" +#define UID_BRWEVT_UNLOADING "EXTENSIONS_UID_BRWEVT_UNLOADING" +#define UID_BRWEVT_UNLOADED "EXTENSIONS_UID_BRWEVT_UNLOADED" +#define UID_BRWEVT_CONFIRMDELETE "EXTENSIONS_UID_BRWEVT_CONFIRMDELETE" +#define UID_BRWEVT_APPROVEROWCHANGE "EXTENSIONS_UID_BRWEVT_APPROVEROWCHANGE" +#define UID_BRWEVT_ROWCHANGE "EXTENSIONS_UID_BRWEVT_ROWCHANGE" +#define UID_BRWEVT_POSITIONING "EXTENSIONS_UID_BRWEVT_POSITIONING" +#define UID_BRWEVT_POSITIONED "EXTENSIONS_UID_BRWEVT_POSITIONED" +#define UID_BRWEVT_APPROVEPARAMETER "EXTENSIONS_UID_BRWEVT_APPROVEPARAMETER" +#define UID_BRWEVT_ERROROCCURED "EXTENSIONS_UID_BRWEVT_ERROROCCURED" +#define UID_BRWEVT_ADJUSTMENTVALUECHANGED "EXTENSIONS_UID_BRWEVT_ADJUSTMENTVALUECHANGED" -#define HID_LAST_PROPC_ID HID_FM_PROPDLG_TAB_EVT - -#if HID_LAST_PROPC_ID > HID_PROPC_END - #error help id overflow (PROPC) -#endif +#define HID_PROP_INPUT_REQUIRED "EXTENSIONS_HID_PROP_INPUT_REQUIRED" +#define HID_PROP_GROUPBOX "EXTENSIONS_HID_PROP_GROUPBOX" +#define HID_PROP_CONTROLSOURCE "EXTENSIONS_HID_PROP_CONTROLSOURCE" +#define HID_PROP_NAME "EXTENSIONS_HID_PROP_NAME" +#define HID_PROP_TABINDEX "EXTENSIONS_HID_PROP_TABINDEX" +#define HID_PROP_MASTERFIELDS "EXTENSIONS_HID_PROP_MASTERFIELDS" +#define HID_PROP_SLAVEFIELDS "EXTENSIONS_HID_PROP_SLAVEFIELDS" +#define HID_PROP_DATASOURCE "EXTENSIONS_HID_PROP_DATASOURCE" +#define HID_PROP_CURSORSOURCE "EXTENSIONS_HID_PROP_CURSORSOURCE" +#define HID_PROP_CURSORSOURCETYPE "EXTENSIONS_HID_PROP_CURSORSOURCETYPE" +#define HID_PROP_CURSORTYPE "EXTENSIONS_HID_PROP_CURSORTYPE" +#define HID_PROP_READONLY "EXTENSIONS_HID_PROP_READONLY" +#define HID_PROP_DATAENTRY "EXTENSIONS_HID_PROP_DATAENTRY" +#define HID_PROP_NAVIGATION "EXTENSIONS_HID_PROP_NAVIGATION" +#define HID_PROP_CYCLE "EXTENSIONS_HID_PROP_CYCLE" +#define HID_PROP_ALLOW_ADDITIONS "EXTENSIONS_HID_PROP_ALLOW_ADDITIONS" +#define HID_PROP_ALLOW_EDITS "EXTENSIONS_HID_PROP_ALLOW_EDITS" +#define HID_PROP_ALLOW_DELETIONS "EXTENSIONS_HID_PROP_ALLOW_DELETIONS" +#define HID_PROP_DIRTY "EXTENSIONS_HID_PROP_DIRTY" +#define HID_PROP_OLDVALUE "EXTENSIONS_HID_PROP_OLDVALUE" +#define HID_PROP_VALUE "EXTENSIONS_HID_PROP_VALUE" +#define HID_PROP_LOCKED "EXTENSIONS_HID_PROP_LOCKED" +#define HID_PROP_FORMATKEY "EXTENSIONS_HID_PROP_FORMATKEY" +#define HID_PROP_REQUIRED "EXTENSIONS_HID_PROP_REQUIRED" +#define HID_PROP_WHEEL_BEHAVIOR "EXTENSIONS_HID_PROP_WHEEL_BEHAVIOR" +#define HID_PROP_UNIQUE "EXTENSIONS_HID_PROP_UNIQUE" +#define HID_PROP_CLASSID "EXTENSIONS_HID_PROP_CLASSID" +#define HID_PROP_LEFT "EXTENSIONS_HID_PROP_LEFT" +#define HID_PROP_RIGHT "EXTENSIONS_HID_PROP_RIGHT" +#define HID_PROP_HEIGHT "EXTENSIONS_HID_PROP_HEIGHT" +#define HID_PROP_WIDTH "EXTENSIONS_HID_PROP_WIDTH" +#define HID_PROP_BOUNDCOLUMN "EXTENSIONS_HID_PROP_BOUNDCOLUMN" +#define HID_PROP_LISTSOURCETYPE "EXTENSIONS_HID_PROP_LISTSOURCETYPE" +#define HID_PROP_LISTSOURCE "EXTENSIONS_HID_PROP_LISTSOURCE" +#define HID_PROP_LISTINDEX "EXTENSIONS_HID_PROP_LISTINDEX" +#define HID_PROP_TEXT "EXTENSIONS_HID_PROP_TEXT" +#define HID_PROP_LABEL "EXTENSIONS_HID_PROP_LABEL" +#define HID_PROP_STRINGITEMLIST "EXTENSIONS_HID_PROP_STRINGITEMLIST" +#define HID_PROP_SEARCHING "EXTENSIONS_HID_PROP_SEARCHING" +#define HID_PROP_FONT "EXTENSIONS_HID_PROP_FONT" +#define HID_PROP_ROWHEIGHT "EXTENSIONS_HID_PROP_ROWHEIGHT" +#define HID_PROP_BACKGROUNDCOLOR "EXTENSIONS_HID_PROP_BACKGROUNDCOLOR" +#define HID_PROP_FILLCOLOR "EXTENSIONS_HID_PROP_FILLCOLOR" +#define HID_PROP_LINECOLOR "EXTENSIONS_HID_PROP_LINECOLOR" +#define HID_PROP_BORDER "EXTENSIONS_HID_PROP_BORDER" +#define HID_PROP_ALIGN "EXTENSIONS_HID_PROP_ALIGN" +#define HID_PROP_DROPDOWN "EXTENSIONS_HID_PROP_DROPDOWN" +#define HID_PROP_MULTILINE "EXTENSIONS_HID_PROP_MULTILINE" +#define HID_PROP_HSCROLL "EXTENSIONS_HID_PROP_HSCROLL" +#define HID_PROP_VSCROLL "EXTENSIONS_HID_PROP_VSCROLL" +#define HID_PROP_TABSTOP "EXTENSIONS_HID_PROP_TABSTOP" +#define HID_PROP_REFVALUE "EXTENSIONS_HID_PROP_REFVALUE" +#define HID_PROP_BUTTONTYPE "EXTENSIONS_HID_PROP_BUTTONTYPE" +#define HID_PROP_SUBMIT_ACTION "EXTENSIONS_HID_PROP_SUBMIT_ACTION" +#define HID_PROP_SUBMIT_METHOD "EXTENSIONS_HID_PROP_SUBMIT_METHOD" +#define HID_PROP_SUBMIT_ENCODING "EXTENSIONS_HID_PROP_SUBMIT_ENCODING" +#define HID_PROP_DEFAULTVALUE "EXTENSIONS_HID_PROP_DEFAULTVALUE" +#define HID_PROP_SUBMIT_TARGET "EXTENSIONS_HID_PROP_SUBMIT_TARGET" +#define HID_PROP_DEFAULT_STATE "EXTENSIONS_HID_PROP_DEFAULT_STATE" +#define HID_PROP_IMAGE_URL "EXTENSIONS_HID_PROP_IMAGE_URL" +#define HID_PROP_DEFAULT_SELECT_SEQ "EXTENSIONS_HID_PROP_DEFAULT_SELECT_SEQ" +#define HID_PROP_MULTISELECTION "EXTENSIONS_HID_PROP_MULTISELECTION" +#define HID_PROP_DATE "EXTENSIONS_HID_PROP_DATE" +#define HID_PROP_DATEMIN "EXTENSIONS_HID_PROP_DATEMIN" +#define HID_PROP_DATEMAX "EXTENSIONS_HID_PROP_DATEMAX" +#define HID_PROP_DATEFORMAT "EXTENSIONS_HID_PROP_DATEFORMAT" +#define HID_PROP_TIME "EXTENSIONS_HID_PROP_TIME" +#define HID_PROP_TIMEMIN "EXTENSIONS_HID_PROP_TIMEMIN" +#define HID_PROP_TIMEMAX "EXTENSIONS_HID_PROP_TIMEMAX" +#define HID_PROP_TIMEFORMAT "EXTENSIONS_HID_PROP_TIMEFORMAT" +#define HID_PROP_VALUEMIN "EXTENSIONS_HID_PROP_VALUEMIN" +#define HID_PROP_VALUEMAX "EXTENSIONS_HID_PROP_VALUEMAX" +#define HID_PROP_VALUESTEP "EXTENSIONS_HID_PROP_VALUESTEP" +#define HID_PROP_CURRENCYSYMBOL "EXTENSIONS_HID_PROP_CURRENCYSYMBOL" +#define HID_PROP_EDITMASK "EXTENSIONS_HID_PROP_EDITMASK" +#define HID_PROP_LITERALMASK "EXTENSIONS_HID_PROP_LITERALMASK" +#define HID_PROP_ENABLED "EXTENSIONS_HID_PROP_ENABLED" +#define HID_PROP_AUTOCOMPLETE "EXTENSIONS_HID_PROP_AUTOCOMPLETE" +#define HID_PROP_LINECOUNT "EXTENSIONS_HID_PROP_LINECOUNT" +#define HID_PROP_MAXTEXTLEN "EXTENSIONS_HID_PROP_MAXTEXTLEN" +#define HID_PROP_SPIN "EXTENSIONS_HID_PROP_SPIN" +#define HID_PROP_STRICTFORMAT "EXTENSIONS_HID_PROP_STRICTFORMAT" +#define HID_PROP_SHOWTHOUSANDSEP "EXTENSIONS_HID_PROP_SHOWTHOUSANDSEP" +#define HID_PROP_VERTICAL_ALIGN "EXTENSIONS_HID_PROP_VERTICAL_ALIGN" +#define HID_PROP_PRINTABLE "EXTENSIONS_HID_PROP_PRINTABLE" +#define HID_PROP_TARGET_URL "EXTENSIONS_HID_PROP_TARGET_URL" +#define HID_PROP_TARGET_FRAME "EXTENSIONS_HID_PROP_TARGET_FRAME" +#define HID_PROP_TAG "EXTENSIONS_HID_PROP_TAG" +#define HID_PROP_ECHO_CHAR "EXTENSIONS_HID_PROP_ECHO_CHAR" +#define HID_PROP_EMPTY_IS_NULL "EXTENSIONS_HID_PROP_EMPTY_IS_NULL" +#define HID_PROP_DECIMAL_ACCURACY "EXTENSIONS_HID_PROP_DECIMAL_ACCURACY" +#define HID_PROP_ENABLE_VISIBLE "EXTENSIONS_HID_PROP_ENABLE_VISIBLE" +#define HID_PROP_DEFAULT_BUTTON "EXTENSIONS_HID_PROP_DEFAULT_BUTTON" +#define HID_PROP_HIDDEN_VALUE "EXTENSIONS_HID_PROP_HIDDEN_VALUE" +#define HID_PROP_TRISTATE "EXTENSIONS_HID_PROP_TRISTATE" +#define HID_PROP_NAVIGATIONBAR "EXTENSIONS_HID_PROP_NAVIGATIONBAR" +#define HID_PROP_FILTER "EXTENSIONS_HID_PROP_FILTER" +#define HID_PROP_SORT_CRITERIA "EXTENSIONS_HID_PROP_SORT_CRITERIA" +#define HID_PROP_DEFAULT_LONG_VALUE "EXTENSIONS_HID_PROP_DEFAULT_LONG_VALUE" +#define HID_PROP_DEFAULT_TIME "EXTENSIONS_HID_PROP_DEFAULT_TIME" +#define HID_PROP_DEFAULT_DATE "EXTENSIONS_HID_PROP_DEFAULT_DATE" +#define HID_PROP_HELPTEXT "EXTENSIONS_HID_PROP_HELPTEXT" +#define HID_PROP_HELPURL "EXTENSIONS_HID_PROP_HELPURL" +#define HID_PROP_RECORDMARKER "EXTENSIONS_HID_PROP_RECORDMARKER" +#define HID_PROP_FILTERPROPOSAL "EXTENSIONS_HID_PROP_FILTERPROPOSAL" +#define HID_PROP_EFFECTIVEMIN "EXTENSIONS_HID_PROP_EFFECTIVEMIN" +#define HID_PROP_EFFECTIVEMAX "EXTENSIONS_HID_PROP_EFFECTIVEMAX" +#define HID_PROP_EFFECTIVEDEFAULT "EXTENSIONS_HID_PROP_EFFECTIVEDEFAULT" +#define HID_PROP_CONTROLLABEL "EXTENSIONS_HID_PROP_CONTROLLABEL" +#define HID_PROP_CURRSYM_POSITION "EXTENSIONS_HID_PROP_CURRSYM_POSITION" +#define HID_PROP_ESCAPE_PROCESSING "EXTENSIONS_HID_PROP_ESCAPE_PROCESSING" +#define HID_PROP_TITLE "EXTENSIONS_HID_PROP_TITLE" +#define HID_PROP_STEP "EXTENSIONS_HID_PROP_STEP" +#define HID_PROP_PROGRESSVALUE "EXTENSIONS_HID_PROP_PROGRESSVALUE" +#define HID_PROP_PROGRESSVALUE_MIN "EXTENSIONS_HID_PROP_PROGRESSVALUE_MIN" +#define HID_PROP_PROGRESSVALUE_MAX "EXTENSIONS_HID_PROP_PROGRESSVALUE_MAX" +#define HID_PROP_SCROLLVALUE "EXTENSIONS_HID_PROP_SCROLLVALUE" +#define HID_PROP_SCROLLVALUE_MAX "EXTENSIONS_HID_PROP_SCROLLVALUE_MAX" +#define HID_PROP_LINEINCREMENT "EXTENSIONS_HID_PROP_LINEINCREMENT" +#define HID_PROP_BLOCKINCREMENT "EXTENSIONS_HID_PROP_BLOCKINCREMENT" +#define HID_PROP_VISIBLESIZE "EXTENSIONS_HID_PROP_VISIBLESIZE" +#define HID_PROP_ORIENTATION "EXTENSIONS_HID_PROP_ORIENTATION" +#define HID_PROP_POSITIONX "EXTENSIONS_HID_PROP_POSITIONX" +#define HID_PROP_POSITIONY "EXTENSIONS_HID_PROP_POSITIONY" +#define HID_PROP_PUSHBUTTONTYPE "EXTENSIONS_HID_PROP_PUSHBUTTONTYPE" +#define HID_PROP_STATE "EXTENSIONS_HID_PROP_STATE" +#define HID_PROP_SCALEIMAGE "EXTENSIONS_HID_PROP_SCALEIMAGE" +#define HID_PROP_BOUND_CELL "EXTENSIONS_HID_PROP_BOUND_CELL" +#define HID_PROP_LIST_CELL_RANGE "EXTENSIONS_HID_PROP_LIST_CELL_RANGE" +#define HID_PROP_CELL_EXCHANGE_TYPE "EXTENSIONS_HID_PROP_CELL_EXCHANGE_TYPE" +#define HID_PROP_SELECTEDITEMS "EXTENSIONS_HID_PROP_SELECTEDITEMS" +#define HID_PROP_SCROLLVALUE_MIN "EXTENSIONS_HID_PROP_SCROLLVALUE_MIN" +#define HID_PROP_DEFAULT_SCROLLVALUE "EXTENSIONS_HID_PROP_DEFAULT_SCROLLVALUE" +#define HID_PROP_REPEAT_DELAY "EXTENSIONS_HID_PROP_REPEAT_DELAY" +#define HID_PROP_SYMBOLCOLOR "EXTENSIONS_HID_PROP_SYMBOLCOLOR" +#define HID_PROP_SPINVALUE "EXTENSIONS_HID_PROP_SPINVALUE" +#define HID_PROP_SPINVALUE_MIN "EXTENSIONS_HID_PROP_SPINVALUE_MIN" +#define HID_PROP_SPINVALUE_MAX "EXTENSIONS_HID_PROP_SPINVALUE_MAX" +#define HID_PROP_DEFAULT_SPINVALUE "EXTENSIONS_HID_PROP_DEFAULT_SPINVALUE" +#define HID_PROP_SPININCREMENT "EXTENSIONS_HID_PROP_SPININCREMENT" +#define HID_PROP_REPEAT "EXTENSIONS_HID_PROP_REPEAT" +#define HID_PROP_WORDBREAK "EXTENSIONS_HID_PROP_WORDBREAK" +#define HID_PROP_SHOW_SCROLLBARS "EXTENSIONS_HID_PROP_SHOW_SCROLLBARS" +#define HID_PROP_TABORDER_CONTROLS "EXTENSIONS_HID_PROP_TABORDER_CONTROLS" +#define HID_FIELDLINK_DETAIL_COLUMN "EXTENSIONS_HID_FIELDLINK_DETAIL_COLUMN" +#define HID_FIELDLINK_MASTER_COLUMN "EXTENSIONS_HID_FIELDLINK_MASTER_COLUMN" +#define UID_FIELDLINK_DETAIL1 "EXTENSIONS_UID_FIELDLINK_DETAIL1" +#define UID_FIELDLINK_MASTER1 "EXTENSIONS_UID_FIELDLINK_MASTER1" +#define UID_FIELDLINK_DETAIL2 "EXTENSIONS_UID_FIELDLINK_DETAIL2" +#define UID_FIELDLINK_MASTER2 "EXTENSIONS_UID_FIELDLINK_MASTER2" +#define UID_FIELDLINK_DETAIL3 "EXTENSIONS_UID_FIELDLINK_DETAIL3" +#define UID_FIELDLINK_MASTER3 "EXTENSIONS_UID_FIELDLINK_MASTER3" +#define UID_FIELDLINK_DETAIL4 "EXTENSIONS_UID_FIELDLINK_DETAIL4" +#define UID_FIELDLINK_MASTER4 "EXTENSIONS_UID_FIELDLINK_MASTER4" +#define HID_PROP_ICONSIZE "EXTENSIONS_HID_PROP_ICONSIZE" +#define HID_PROP_SHOW_POSITION "EXTENSIONS_HID_PROP_SHOW_POSITION" +#define HID_PROP_SHOW_NAVIGATION "EXTENSIONS_HID_PROP_SHOW_NAVIGATION" +#define HID_PROP_SHOW_RECORDACTIONS "EXTENSIONS_HID_PROP_SHOW_RECORDACTIONS" +#define HID_PROP_SHOW_FILTERSORT "EXTENSIONS_HID_PROP_SHOW_FILTERSORT" +#define HID_PROP_AUTOLINEBREAK "EXTENSIONS_HID_PROP_AUTOLINEBREAK" +#define HID_PROP_TEXTTYPE "EXTENSIONS_HID_PROP_TEXTTYPE" +#define HID_PROP_LINEEND_FORMAT "EXTENSIONS_HID_PROP_LINEEND_FORMAT" +#define HID_PROP_XSD_TOTAL_DIGITS "EXTENSIONS_HID_PROP_XSD_TOTAL_DIGITS" +#define HID_PROP_XSD_FRACTION_DIGITS "EXTENSIONS_HID_PROP_XSD_FRACTION_DIGITS" +#define HID_PROP_XSD_MAX_INCLUSIVE "EXTENSIONS_HID_PROP_XSD_MAX_INCLUSIVE" +#define HID_PROP_XSD_MAX_EXCLUSIVE "EXTENSIONS_HID_PROP_XSD_MAX_EXCLUSIVE" +#define HID_PROP_XSD_MIN_INCLUSIVE "EXTENSIONS_HID_PROP_XSD_MIN_INCLUSIVE" +#define HID_PROP_XSD_MIN_EXCLUSIVE "EXTENSIONS_HID_PROP_XSD_MIN_EXCLUSIVE" +#define HID_PROP_UNCHECKEDREFVALUE "EXTENSIONS_HID_PROP_UNCHECKEDREFVALUE" +#define HID_PROP_SUBMISSION_ID "EXTENSIONS_HID_PROP_SUBMISSION_ID" +#define UID_EVT_MACRODLG "EXTENSIONS_UID_EVT_MACRODLG" +#define HID_PROP_XML_DATA_MODEL "EXTENSIONS_HID_PROP_XML_DATA_MODEL" +#define HID_PROP_BIND_EXPRESSION "EXTENSIONS_HID_PROP_BIND_EXPRESSION" +#define HID_PROP_XSD_REQUIRED "EXTENSIONS_HID_PROP_XSD_REQUIRED" +#define HID_PROP_XSD_RELEVANT "EXTENSIONS_HID_PROP_XSD_RELEVANT" +#define HID_PROP_XSD_READONLY "EXTENSIONS_HID_PROP_XSD_READONLY" +#define HID_PROP_XSD_CONSTRAINT "EXTENSIONS_HID_PROP_XSD_CONSTRAINT" +#define HID_PROP_XSD_CALCULATION "EXTENSIONS_HID_PROP_XSD_CALCULATION" +#define HID_PROP_XSD_DATA_TYPE "EXTENSIONS_HID_PROP_XSD_DATA_TYPE" +#define HID_PROP_XSD_WHITESPACES "EXTENSIONS_HID_PROP_XSD_WHITESPACES" +#define HID_PROP_XSD_PATTERN "EXTENSIONS_HID_PROP_XSD_PATTERN" +#define HID_PROP_XSD_LENGTH "EXTENSIONS_HID_PROP_XSD_LENGTH" +#define HID_PROP_XSD_MIN_LENGTH "EXTENSIONS_HID_PROP_XSD_MIN_LENGTH" +#define HID_PROP_XSD_MAX_LENGTH "EXTENSIONS_HID_PROP_XSD_MAX_LENGTH" +#define HID_PROP_LIST_BINDING "EXTENSIONS_HID_PROP_LIST_BINDING" +#define HID_PROP_BINDING_NAME "EXTENSIONS_HID_PROP_BINDING_NAME" +#define HID_PROP_SELECTION_TYPE "EXTENSIONS_HID_PROP_SELECTION_TYPE" +#define HID_PROP_ROOT_DISPLAYED "EXTENSIONS_HID_PROP_ROOT_DISPLAYED" +#define HID_PROP_SHOWS_HANDLES "EXTENSIONS_HID_PROP_SHOWS_HANDLES" +#define HID_PROP_SHOWS_ROOT_HANDLES "EXTENSIONS_HID_PROP_SHOWS_ROOT_HANDLES" +#define HID_PROP_EDITABLE "EXTENSIONS_HID_PROP_EDITABLE" +#define HID_PROP_INVOKES_STOP_NOT_EDITING "EXTENSIONS_HID_PROP_INVOKES_STOP_NOT_EDITING" +#define HID_PROP_ROW_HEIGHT "EXTENSIONS_HID_PROP_ROW_HEIGHT" +#define HID_PROP_DECORATION "EXTENSIONS_HID_PROP_DECORATION" +#define HID_EVT_ACTIONPERFORMED "EXTENSIONS_HID_EVT_ACTIONPERFORMED" +#define HID_EVT_AFTERUPDATE "EXTENSIONS_HID_EVT_AFTERUPDATE" +#define HID_EVT_BEFOREUPDATE "EXTENSIONS_HID_EVT_BEFOREUPDATE" +#define HID_EVT_CONFIRMDELETE "EXTENSIONS_HID_EVT_CONFIRMDELETE" +#define HID_EVT_ERROROCCURED "EXTENSIONS_HID_EVT_ERROROCCURED" +#define HID_EVT_FOCUSGAINED "EXTENSIONS_HID_EVT_FOCUSGAINED" +#define HID_EVT_FOCUSLOST "EXTENSIONS_HID_EVT_FOCUSLOST" +#define HID_EVT_ITEMSTATECHANGED "EXTENSIONS_HID_EVT_ITEMSTATECHANGED" +#define HID_EVT_KEYTYPED "EXTENSIONS_HID_EVT_KEYTYPED" +#define HID_EVT_LOADED "EXTENSIONS_HID_EVT_LOADED" +#define HID_EVT_MOUSEDRAGGED "EXTENSIONS_HID_EVT_MOUSEDRAGGED" +#define HID_EVT_MOUSEENTERED "EXTENSIONS_HID_EVT_MOUSEENTERED" +#define HID_EVT_MOUSEEXITED "EXTENSIONS_HID_EVT_MOUSEEXITED" +#define HID_EVT_MOUSEMOVED "EXTENSIONS_HID_EVT_MOUSEMOVED" +#define HID_EVT_MOUSEPRESSED "EXTENSIONS_HID_EVT_MOUSEPRESSED" +#define HID_EVT_MOUSERELEASED "EXTENSIONS_HID_EVT_MOUSERELEASED" +#define HID_EVT_POSITIONED "EXTENSIONS_HID_EVT_POSITIONED" +#define HID_EVT_RESETTED "EXTENSIONS_HID_EVT_RESETTED" +#define HID_EVT_SUBMITTED "EXTENSIONS_HID_EVT_SUBMITTED" +#define HID_EVT_TEXTCHANGED "EXTENSIONS_HID_EVT_TEXTCHANGED" +#define HID_EVT_UNLOADED "EXTENSIONS_HID_EVT_UNLOADED" +#define HID_EVT_CHANGED "EXTENSIONS_HID_EVT_CHANGED" +#define HID_EVT_APPROVEACTIONPERFORMED "EXTENSIONS_HID_EVT_APPROVEACTIONPERFORMED" +#define HID_EVT_APPROVERESETTED "EXTENSIONS_HID_EVT_APPROVERESETTED" +#define HID_EVT_KEYUP "EXTENSIONS_HID_EVT_KEYUP" +#define HID_EVT_APPROVEPARAMETER "EXTENSIONS_HID_EVT_APPROVEPARAMETER" +#define HID_EVT_POSITIONING "EXTENSIONS_HID_EVT_POSITIONING" +#define HID_EVT_RELOADED "EXTENSIONS_HID_EVT_RELOADED" +#define HID_EVT_APPROVEROWCHANGE "EXTENSIONS_HID_EVT_APPROVEROWCHANGE" +#define HID_EVT_ROWCHANGE "EXTENSIONS_HID_EVT_ROWCHANGE" +#define HID_EVT_RELOADING "EXTENSIONS_HID_EVT_RELOADING" +#define HID_EVT_UNLOADING "EXTENSIONS_HID_EVT_UNLOADING" +#define HID_EVT_ADJUSTMENTVALUECHANGED "EXTENSIONS_HID_EVT_ADJUSTMENTVALUECHANGED" +#define HID_PROP_TOGGLE "EXTENSIONS_HID_PROP_TOGGLE" +#define HID_PROP_FOCUSONCLICK "EXTENSIONS_HID_PROP_FOCUSONCLICK" +#define HID_PROP_HIDEINACTIVESELECTION "EXTENSIONS_HID_PROP_HIDEINACTIVESELECTION" +#define HID_PROP_VISUALEFFECT "EXTENSIONS_HID_PROP_VISUALEFFECT" +#define HID_PROP_BORDERCOLOR "EXTENSIONS_HID_PROP_BORDERCOLOR" +#define HID_PROP_IMAGEPOSITION "EXTENSIONS_HID_PROP_IMAGEPOSITION" +#define HID_PROP_NOLABEL "EXTENSIONS_HID_PROP_NOLABEL" +#define HID_PROP_WRITING_MODE "EXTENSIONS_HID_PROP_WRITING_MODE" +#define HID_PROP_ANCHOR_TYPE "EXTENSIONS_HID_PROP_ANCHOR_TYPE" +#define HID_FM_PROPDLG_TABCTR "EXTENSIONS_HID_FM_PROPDLG_TABCTR" +#define HID_FM_PROPDLG_TAB_GENERAL "EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL" +#define HID_FM_PROPDLG_TAB_DATA "EXTENSIONS_HID_FM_PROPDLG_TAB_DATA" +#define HID_FM_PROPDLG_TAB_EVT "EXTENSIONS_HID_FM_PROPDLG_TAB_EVT" #endif // EXTENSIONS_PROPCTRLR_HRC diff --git a/extensions/inc/update.hrc b/extensions/inc/update.hrc index 9dd346315..dcdcfaaa4 100644 --- a/extensions/inc/update.hrc +++ b/extensions/inc/update.hrc @@ -27,23 +27,15 @@ #ifndef EXTENSIONS_UPDATE_HRC #define EXTENSIONS_UPDATE_HRC -#include "extensio.hrc" - -#define HID_CHECK_FOR_UPD_DLG ( HID_UPDATE_START + 0) -#define HID_CHECK_FOR_UPD_CLOSE ( HID_UPDATE_START + 1) -#define HID_CHECK_FOR_UPD_PAUSE ( HID_UPDATE_START + 2) -#define HID_CHECK_FOR_UPD_RESUME ( HID_UPDATE_START + 3) -#define HID_CHECK_FOR_UPD_DOWNLOAD ( HID_UPDATE_START + 4) -#define HID_CHECK_FOR_UPD_DOWNLOAD2 ( HID_UPDATE_START + 5) -#define HID_CHECK_FOR_UPD_INSTALL ( HID_UPDATE_START + 6) -#define HID_CHECK_FOR_UPD_STATUS ( HID_UPDATE_START + 7) -#define HID_CHECK_FOR_UPD_DESCRIPTION ( HID_UPDATE_START + 8) -#define HID_CHECK_FOR_UPD_CANCEL ( HID_UPDATE_START + 9) - // !! if you add new IDs, please also adjust HID_UPDATE_LAST below !! -#define HID_UPDATE_LAST HID_CHECK_FOR_UPD_CANCEL - -#if HID_UPDATE_LAST > HID_UPDATE_END - #error help id range overflow (UPDATE) -#endif +#define HID_CHECK_FOR_UPD_DLG "EXTENSIONS_HID_CHECK_FOR_UPD_DLG" +#define HID_CHECK_FOR_UPD_CLOSE "EXTENSIONS_HID_CHECK_FOR_UPD_CLOSE" +#define HID_CHECK_FOR_UPD_PAUSE "EXTENSIONS_HID_CHECK_FOR_UPD_PAUSE" +#define HID_CHECK_FOR_UPD_RESUME "EXTENSIONS_HID_CHECK_FOR_UPD_RESUME" +#define HID_CHECK_FOR_UPD_DOWNLOAD "EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD" +#define HID_CHECK_FOR_UPD_DOWNLOAD2 "EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD2" +#define HID_CHECK_FOR_UPD_INSTALL "EXTENSIONS_HID_CHECK_FOR_UPD_INSTALL" +#define HID_CHECK_FOR_UPD_STATUS "EXTENSIONS_HID_CHECK_FOR_UPD_STATUS" +#define HID_CHECK_FOR_UPD_DESCRIPTION "EXTENSIONS_HID_CHECK_FOR_UPD_DESCRIPTION" +#define HID_CHECK_FOR_UPD_CANCEL "EXTENSIONS_HID_CHECK_FOR_UPD_CANCEL" #endif // EXTENSIONS_UPDATE_HRC diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst index 1489e2a4e..e6a4e02a8 100644 --- a/extensions/prj/build.lst +++ b/extensions/prj/build.lst @@ -34,3 +34,6 @@ ex extensions\source\update\feed nmake - all ex_updchkfeed ex ex extensions\source\update\check nmake - all ex_updchk ex_inc NULL ex extensions\source\update\ui nmake - all ex_updchkui ex_inc NULL ex extensions\util nmake - all ex_util ex_preload ex_abpilot ex_dbpilots ex_logging ex_ldap ex_propctrlr ex_bib ex_plutil ex_oooimprovecore NULL + +# Fails at the moment +# ex extensions\qa\complex\extensions nmake - all ex_complex ex_util NULL diff --git a/extensions/prj/d.lst b/extensions/prj/d.lst index ecfe0ef9a..5b974816c 100644 --- a/extensions/prj/d.lst +++ b/extensions/prj/d.lst @@ -22,6 +22,7 @@ mkdir: %_DEST%\bin%_EXT%\so ..\%__SRC%\bin\npsoplugin_so.dll %_DEST%\bin%_EXT%\so\npsoplugin.dll ..\%__SRC%\bin\x64\so_activex.dll %_DEST%\bin%_EXT%\so_activex_x64.dll ..\%__SRC%\bin\mdibundle.zip %_DEST%\bin%_EXT%\mdibundle.zip +..\%__SRC%\misc\oleautobridge.component %_DEST%\xml%_EXT%\oleautobridge.component ..\source\bibliography\uiconfig\sbibliography\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sbibliography\menubar\*.xml @@ -39,3 +40,19 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Logging ..\%__SRC%\misc\registry\spool\org\openoffice\Office\Logging\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Logging ..\%__SRC%\bin\*.oxt %_DEST%\pck%_EXT%\* +..\%__SRC%\misc\abp.component %_DEST%\xml%_EXT%\abp.component +..\%__SRC%\misc\bib.component %_DEST%\xml%_EXT%\bib.component +..\%__SRC%\misc\dbp.component %_DEST%\xml%_EXT%\dbp.component +..\%__SRC%\misc\ldapbe2.component %_DEST%\xml%_EXT%\ldapbe2.component +..\%__SRC%\misc\log.component %_DEST%\xml%_EXT%\log.component +..\%__SRC%\misc\oooimprovecore.component %_DEST%\xml%_EXT%\oooimprovecore.component +..\%__SRC%\misc\oooimprovement.component %_DEST%\xml%_EXT%\oooimprovement.component +..\%__SRC%\misc\pcr.component %_DEST%\xml%_EXT%\pcr.component +..\%__SRC%\misc\pl.component %_DEST%\xml%_EXT%\pl.component +..\%__SRC%\misc\preload.component %_DEST%\xml%_EXT%\preload.component +..\%__SRC%\misc\res.component %_DEST%\xml%_EXT%\res.component +..\%__SRC%\misc\scn.component %_DEST%\xml%_EXT%\scn.component +..\%__SRC%\misc\updatefeed.component %_DEST%\xml%_EXT%\updatefeed.component +..\%__SRC%\misc\updchk.component %_DEST%\xml%_EXT%\updchk.component +..\%__SRC%\misc\updchk.uno.component %_DEST%\xml%_EXT%\updchk.uno.component +..\%__SRC%\misc\xmx.component %_DEST%\xml%_EXT%\xmx.component diff --git a/extensions/qa/complex/extensions/OfficeResourceLoader.java b/extensions/qa/complex/extensions/OfficeResourceLoader.java index 16bc967cc..6d5df80f8 100644 --- a/extensions/qa/complex/extensions/OfficeResourceLoader.java +++ b/extensions/qa/complex/extensions/OfficeResourceLoader.java @@ -26,6 +26,7 @@ ************************************************************************/ package complex.extensions; +import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; import com.sun.star.resource.XResourceBundle; @@ -34,7 +35,15 @@ import com.sun.star.beans.XPropertySet; import com.sun.star.uno.XComponentContext; import com.sun.star.lang.Locale; -public class OfficeResourceLoader extends complexlib.ComplexTestCase +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +public class OfficeResourceLoader { XResourceBundleLoader m_loader; XResourceBundle m_bundle; @@ -45,37 +54,36 @@ public class OfficeResourceLoader extends complexlib.ComplexTestCase } /* ------------------------------------------------------------------ */ - public String[] getTestMethodNames() - { - return new String[] { - "checkSimpleStringAccess", - "checkLocales" - }; - } +// public String[] getTestMethodNames() +// { +// return new String[] { +// "checkSimpleStringAccess", +// "checkLocales" +// }; +// } /* ------------------------------------------------------------------ */ - public String getTestObjectName() - { - return "Extensions - OfficeResourceLoader"; - } +// public String getTestObjectName() +// { +// return "Extensions - OfficeResourceLoader"; +// } /* ------------------------------------------------------------------ */ - public void before() throws com.sun.star.uno.Exception, java.lang.Exception + @Before public void before() throws com.sun.star.uno.Exception, java.lang.Exception { - XPropertySet orb = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class, param.getMSF() ); - XComponentContext context = (XComponentContext)UnoRuntime.queryInterface( XComponentContext.class, - orb.getPropertyValue( "DefaultContext" ) ); + XPropertySet orb = UnoRuntime.queryInterface(XPropertySet.class, getMSF()); + XComponentContext context = UnoRuntime.queryInterface(XComponentContext.class, orb.getPropertyValue("DefaultContext")); m_loader = com.sun.star.resource.OfficeResourceLoader.get( context ); } /* ------------------------------------------------------------------ */ - public void after() throws com.sun.star.uno.Exception, java.lang.Exception + @After public void after() throws com.sun.star.uno.Exception, java.lang.Exception { } /* ------------------------------------------------------------------ */ - public void checkSimpleStringAccess() throws com.sun.star.uno.Exception, java.lang.Exception + @Test public void checkSimpleStringAccess() throws com.sun.star.uno.Exception, java.lang.Exception { // default bundle (UI locale) m_bundle = m_loader.loadBundle_Default( "orl" ); @@ -88,34 +96,62 @@ public class OfficeResourceLoader extends complexlib.ComplexTestCase && resourceLocale.Country.equals( "US" ) && resourceLocale.Variant.equals( "" ) ) - assure( "invalid 'en-US' string", testString.equals( "Dummy String" ) ); + { + assertTrue( "invalid 'en-US' string", testString.equals( "Dummy String" ) ); + } if ( resourceLocale.Language.equals( "de" ) && resourceLocale.Country.equals( "" ) && resourceLocale.Variant.equals( "" ) ) - assure( "invalid 'de' string", testString.equals( "Attrappen-Zeichenkette" ) ); + { + assertTrue( "invalid 'de' string", testString.equals( "Attrappen-Zeichenkette" ) ); + } if ( resourceLocale.Language.equals( "" ) && resourceLocale.Country.equals( "" ) && resourceLocale.Variant.equals( "" ) ) - assure( "invalid unlocalized string", testString.equals( "unlocalized string" ) ); + { + assertTrue( "invalid unlocalized string", testString.equals( "unlocalized string" ) ); + } } /* ------------------------------------------------------------------ */ - public void checkLocales() throws com.sun.star.uno.Exception, java.lang.Exception + @Test public void checkLocales() throws com.sun.star.uno.Exception, java.lang.Exception { // en-US bundle (should always be built and thus present and thus found) m_bundle = m_loader.loadBundle( "orl", new Locale( "en", "US", "" ) ); Locale resourceLocale = m_bundle.getLocale(); - assure( "'en-US' could not be loaded", + assertTrue( "'en-US' could not be loaded", resourceLocale.Language.equals( "en" ) && resourceLocale.Country.equals( "US" ) && resourceLocale.Variant.equals( "" ) ); // some (invalid) locale which is usually no built, and should thus fallback to en-US m_bundle = m_loader.loadBundle( "orl", new Locale( "inv", "al", "id" ) ); resourceLocale = m_bundle.getLocale(); - assure( "non-existing locale request does not fallback to en-US", + assertTrue( "non-existing locale request does not fallback to en-US", resourceLocale.Language.equals( "en" ) && resourceLocale.Country.equals( "US" ) && resourceLocale.Variant.equals( "" ) ); } + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); } diff --git a/extensions/qa/complex/extensions/makefile.mk b/extensions/qa/complex/extensions/makefile.mk index 96c2afb40..281960b32 100644 --- a/extensions/qa/complex/extensions/makefile.mk +++ b/extensions/qa/complex/extensions/makefile.mk @@ -25,12 +25,26 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = ExtensionsComplexTests +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE + +PRJ = ../../.. PRJNAME = extensions -PACKAGE = complex$/$(PRJNAME) +TARGET = qa_complex_extensions + +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/extensions +JAVATESTFILES = \ + OfficeResourceLoader.java + +JAVAFILES = $(JAVATESTFILES) + +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar jurt.jar ConnectivityTools.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) +.END + -RES_TARGET = orl .IF "$(GUI)"=="WNT" command_seperator=&& @@ -38,11 +52,11 @@ command_seperator=&& command_seperator=; .ENDIF -# --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk +.INCLUDE: settings.mk #----- resource files for the OfficeResourceLoader test ------------ +RES_TARGET = orl SRS1NAME=$(RES_TARGET)_A_ SRC1FILES= \ @@ -66,36 +80,19 @@ RES2FILELIST=\ RESLIB2NAME=$(RES_TARGET)_B_ RESLIB2SRSFILES=$(RES2FILELIST) +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -#----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar ConnectivityTools.jar -JAVAFILES = $(shell @$(FIND) .$/*.java) -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk +#----- resource files for the OfficeResourceLoader test ------------ -RUNNER_CLASSPATH = -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPERATOR)$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/ConnectivityTools.jar -RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex -run:copy_resources - +java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce extensions_all.sce +ALLTAR : copy_resources javatest -run_%:copy_resources - +java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/run_//) +copy_resources: $(RESLIB1TARGETN) $(RESLIB2TARGETN) + $(foreach,i,$(RESLIB1TARGETN) $(COPY) $i $(i:s/de/invalid/:s/_A_//) $(command_seperator)) echo + $(foreach,i,$(RESLIB2TARGETN) $(COPY) $i $(i:s/en-US/invalid/:s/_B_//) $(command_seperator)) echo -copy_resources: $(RESLIB1TARGETN) $(RESLIB2TARGETN) - @$(foreach,i,$(RESLIB1TARGETN) $(COPY) $i $(i:s/de/invalid/:s/_A_//) $(command_seperator)) echo. - @$(foreach,i,$(RESLIB2TARGETN) $(COPY) $i $(i:s/en-US/invalid/:s/_B_//) $(command_seperator)) echo. +.END diff --git a/extensions/source/abpilot/abp.component b/extensions/source/abpilot/abp.component new file mode 100644 index 000000000..a07cef986 --- /dev/null +++ b/extensions/source/abpilot/abp.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="org.openoffice.comp.abp.OAddressBookSourcePilot"> + <service name="com.sun.star.ui.dialogs.AddressBookSourcePilot"/> + </implementation> +</component> diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc index 273ba6b6e..08ade5d67 100644 --- a/extensions/source/abpilot/abpresid.hrc +++ b/extensions/source/abpilot/abpresid.hrc @@ -29,7 +29,8 @@ #define EXTENSIONS_ABPRESID_HRC #include "abpilot.hrc" - +#include "extensio.hrc" + //======================================================================== // basics diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx index f4131c8ba..f589ac0db 100644 --- a/extensions/source/abpilot/abpservices.cxx +++ b/extensions/source/abpilot/abpservices.cxx @@ -66,27 +66,6 @@ component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* pServiceManager, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - return ::abp::OModule::writeComponentInfos( - static_cast<XMultiServiceFactory*>(pServiceManager), - static_cast<XRegistryKey*>(pRegistryKey)); - } - catch (InvalidRegistryException& ) - { - OSL_ASSERT("abp::component_writeInfo: could not create a registry key (InvalidRegistryException) !"); - } - - return sal_False; -} - -//--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src index a69ac07eb..f159ff692 100644 --- a/extensions/source/abpilot/abspilot.src +++ b/extensions/source/abpilot/abspilot.src @@ -71,6 +71,7 @@ ModalDialog RID_DLG_ADDRESSBOOKSOURCEPILOT //........................................................................ TabPage RID_PAGE_SELECTABTYPE { + HelpID = "extensions:TabPage:RID_PAGE_SELECTABTYPE"; SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; @@ -93,56 +94,67 @@ TabPage RID_PAGE_SELECTABTYPE RadioButton RB_EVOLUTION { + HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION"; Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ; Text [ en-US ] = "Evolution"; }; RadioButton RB_EVOLUTION_GROUPWISE { + HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION_GROUPWISE"; Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ; Text [ en-US ] = "Groupwise"; }; RadioButton RB_EVOLUTION_LDAP { + HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION_LDAP"; Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ; Text [ en-US ] = "Evolution LDAP"; }; RadioButton RB_MORK { + HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK"; Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ; Text [ en-US ] = "Mozilla / Netscape"; }; RadioButton RB_THUNDERBIRD { + HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_THUNDERBIRD"; Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ; Text [ en-US ] = "Thunderbird"; }; RadioButton RB_KAB { + HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_KAB"; Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ; Text [ en-US ] = "KDE address book"; }; RadioButton RB_MACAB { + HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MACAB"; Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ; Text [ en-US ] = "Mac OS X address book"; }; RadioButton RB_LDAP { + HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP"; Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ; Text [ en-US ] = "LDAP address data"; }; RadioButton RB_OUTLOOK { + HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK"; Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ; Text [ en-US ] = "Outlook address book"; }; RadioButton RB_OUTLOOKEXPRESS { + HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOKEXPRESS"; Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ; Text [ en-US ] = "Windows system address book"; }; RadioButton RB_OTHER { + HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OTHER"; Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ; Text [ en-US ] = "Other external data source"; }; @@ -151,6 +163,7 @@ TabPage RID_PAGE_SELECTABTYPE //........................................................................ TabPage RID_PAGE_ADMININVOKATION { + HelpID = "extensions:TabPage:RID_PAGE_ADMININVOKATION"; SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; @@ -165,6 +178,7 @@ TabPage RID_PAGE_ADMININVOKATION PushButton PB_INVOKE_ADMIN_DIALOG { + HelpID = "extensions:PushButton:RID_PAGE_ADMININVOKATION:PB_INVOKE_ADMIN_DIALOG"; Pos = MAP_APPFONT ( ( WINDOW_SIZE_X - BUTTON_SIZE_X ) / 2, 60 ) ; Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ; @@ -185,6 +199,7 @@ TabPage RID_PAGE_ADMININVOKATION //........................................................................ TabPage RID_PAGE_TABLESELECTION_AB { + HelpID = "extensions:TabPage:RID_PAGE_TABLESELECTION_AB"; SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; @@ -199,6 +214,7 @@ TabPage RID_PAGE_TABLESELECTION_AB ListBox LB_TABLELIST { + HelpID = "extensions:ListBox:RID_PAGE_TABLESELECTION_AB:LB_TABLELIST"; Pos = MAP_APPFONT ( BORDER_X, 36 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 50 ) ; SVLook = TRUE; @@ -212,6 +228,7 @@ TabPage RID_PAGE_TABLESELECTION_AB //........................................................................ TabPage RID_PAGE_FIELDMAPPING { + HelpID = "extensions:TabPage:RID_PAGE_FIELDMAPPING"; SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; @@ -226,6 +243,7 @@ TabPage RID_PAGE_FIELDMAPPING PushButton PB_INVOKE_FIELDS_DIALOG { + HelpID = "extensions:PushButton:RID_PAGE_FIELDMAPPING:PB_INVOKE_FIELDS_DIALOG"; Pos = MAP_APPFONT ( ( WINDOW_SIZE_X - BUTTON_SIZE_X ) / 2, 84 ) ; Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ; @@ -243,6 +261,7 @@ TabPage RID_PAGE_FIELDMAPPING //........................................................................ TabPage RID_PAGE_FINAL { + HelpID = "extensions:TabPage:RID_PAGE_FINAL"; SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; @@ -266,6 +285,7 @@ TabPage RID_PAGE_FINAL ComboBox CBB_LOCATION { + HelpID = "extensions:ComboBox:RID_PAGE_FINAL:CBB_LOCATION"; Pos = MAP_APPFONT ( BORDER_X , 64 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 53 - BORDER_X - BORDER_X, 12) ; SVLook = TRUE; @@ -276,6 +296,7 @@ TabPage RID_PAGE_FINAL PushButton PB_BROWSE { + HelpID = "extensions:PushButton:RID_PAGE_FINAL:PB_BROWSE"; Pos = MAP_APPFONT ( WINDOW_SIZE_X - 50 - BORDER_X , 63 ) ; Size = MAP_APPFONT ( 50, 14) ; SVLook = TRUE; @@ -286,6 +307,7 @@ TabPage RID_PAGE_FINAL CheckBox CB_REGISTER_DS { + HelpID = "extensions:CheckBox:RID_PAGE_FINAL:CB_REGISTER_DS"; Pos = MAP_APPFONT ( BORDER_X, 82 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - BORDER_X - BORDER_X, 8) ; SVLook = TRUE; @@ -303,6 +325,7 @@ TabPage RID_PAGE_FINAL Edit ET_DATASOURCENAME { + HelpID = "extensions:Edit:RID_PAGE_FINAL:ET_DATASOURCENAME"; Pos = MAP_APPFONT ( BORDER_X + 10, 104 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 56 - BORDER_X - BORDER_X - 10, 12) ; SVLook = TRUE; diff --git a/extensions/source/abpilot/exports.dxp b/extensions/source/abpilot/exports.dxp index 9630d7e06..f0e1c6993 100644 --- a/extensions/source/abpilot/exports.dxp +++ b/extensions/source/abpilot/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk index 19477e1b6..86bc5c68a 100644 --- a/extensions/source/abpilot/makefile.mk +++ b/extensions/source/abpilot/makefile.mk @@ -104,3 +104,11 @@ DEF1EXPORTFILE= exports.dxp # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/abp.component + +$(MISC)/abp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + abp.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt abp.component diff --git a/extensions/source/bibliography/bib.component b/extensions/source/bibliography/bib.component new file mode 100644 index 000000000..98627854d --- /dev/null +++ b/extensions/source/bibliography/bib.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.extensions.Bibliography"> + <service name="com.sun.star.frame.Bibliography"/> + <service name="com.sun.star.frame.FrameLoader"/> + </implementation> +</component> diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc index eb6afcb44..454bda0e5 100644 --- a/extensions/source/bibliography/bib.hrc +++ b/extensions/source/bibliography/bib.hrc @@ -28,7 +28,7 @@ #define BIB_HRC #include "bibliography.hrc" - +#include <svl/solar.hrc> #ifndef RID_BIB_START #define RID_BIB_START RID_EXTENSIONS_START #endif diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 0b57c4bd4..9d361aff8 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -225,36 +225,6 @@ extern "C" *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - sal_Bool SAL_CALL component_writeInfo( void * //pServiceManager - , registry::XRegistryKey * pRegistryKey ) - { - try - { - rtl::OUString sKey = rtl::OUString::createFromAscii("/"); - sKey += BibliographyLoader::getImplementationName_Static(); - //creates the impl key: /com.sun.star.extensions.Bibliography - Reference< registry::XRegistryKey > xImplKey = pRegistryKey->createKey(sKey); - - - //sKey += rtl::OUString::createFromAscii("/UNO/SERVICES"); - Reference< registry::XRegistryKey > xNewKey = xImplKey->createKey( C2U("/UNO/SERVICES") ); - Sequence< rtl::OUString > aServices = BibliographyLoader::getSupportedServiceNames_Static(); - for( INT32 i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[i]); - xNewKey = xImplKey->createKey( C2U("/UNO/Loader")); - - Reference< registry::XRegistryKey > xPatternKey = xImplKey->createKey( C2U("/Loader/Pattern" )); - xPatternKey->setAsciiValue( C2U( ".component:Bibliography/*" ) ); - - return sal_True; - } - catch (Exception &) - { - return sal_False; - } - } - - void * SAL_CALL component_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * /*pRegistryKey*/ ) { diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 52575a6f3..4f902a689 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -1436,9 +1436,9 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS Reference< XPropertySetInfo > xPropInfo = xPropSet->getPropertySetInfo(); if (xPropInfo->hasPropertyByName(uProp)) { - ::rtl::OUString sId = ::rtl::OUString::createFromAscii( "HID:" ); - sId += ::rtl::OUString::valueOf( (sal_Int32) HID_BIB_DB_GRIDCTRL ); - xPropSet->setPropertyValue( uProp, makeAny( ::rtl::OUString( sId ) ) ); + ::rtl::OUString sId = ::rtl::OUString::createFromAscii( INET_HID_SCHEME ); + sId += ::rtl::OUString::createFromAscii( HID_BIB_DB_GRIDCTRL ); + xPropSet->setPropertyValue( uProp, makeAny( sId ) ); } } catch(Exception& e ) diff --git a/extensions/source/bibliography/datman.src b/extensions/source/bibliography/datman.src index 6b8c4b00e..639e6640d 100644 --- a/extensions/source/bibliography/datman.src +++ b/extensions/source/bibliography/datman.src @@ -62,6 +62,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_IDENTIFIER { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_IDENTIFIER"; Pos = MAP_APPFONT ( 65 , 13 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -73,6 +74,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_AUTHORITYTYPE { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_AUTHORITYTYPE"; Pos = MAP_APPFONT ( 171 , 13 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -84,6 +86,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_YEAR { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_YEAR"; Pos = MAP_APPFONT ( 282 , 13 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -95,6 +98,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_AUTHOR { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_AUTHOR"; Pos = MAP_APPFONT ( 65 , 28 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -106,6 +110,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_TITLE { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_TITLE"; Pos = MAP_APPFONT ( 171 , 28 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -117,6 +122,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_PUBLISHER { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_PUBLISHER"; Pos = MAP_APPFONT ( 65 , 43 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -128,6 +134,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_ADDRESS { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_ADDRESS"; Pos = MAP_APPFONT ( 171, 43 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -139,6 +146,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_ISBN { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_ISBN"; Pos = MAP_APPFONT ( 282 , 43 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -150,6 +158,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_CHAPTER { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CHAPTER"; Pos = MAP_APPFONT ( 65 , 58 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -161,6 +170,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_PAGES { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_PAGES"; Pos = MAP_APPFONT ( 171, 58) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -172,6 +182,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_EDITOR { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_EDITOR"; Pos = MAP_APPFONT ( 65 , 73 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -183,6 +194,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_EDITION { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_EDITION"; Pos = MAP_APPFONT ( 171 , 73 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -194,6 +206,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_BOOKTITLE { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_BOOKTITLE"; Pos = MAP_APPFONT ( 65, 88 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -205,6 +218,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_VOLUME { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_VOLUME"; Pos = MAP_APPFONT ( 171 , 88 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -216,6 +230,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_HOWPUBLISHED { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_HOWPUBLISHED"; Pos = MAP_APPFONT ( 282, 88 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -227,6 +242,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_ORGANIZATIONS { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_ORGANIZATIONS"; Pos = MAP_APPFONT ( 65 , 103 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -238,6 +254,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_INSTITUTION { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_INSTITUTION"; Pos = MAP_APPFONT ( 171 , 103) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -249,6 +266,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_SCHOOL { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_SCHOOL"; Pos = MAP_APPFONT ( 282 , 103 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -260,6 +278,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_REPORTTYPE { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_REPORTTYPE"; Pos = MAP_APPFONT ( 65 , 118 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -271,6 +290,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_MONTH { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_MONTH"; Pos = MAP_APPFONT ( 171 , 118) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -282,6 +302,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_JOURNAL { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_JOURNAL"; Pos = MAP_APPFONT ( 65 , 133) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -293,6 +314,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_NUMBER { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_NUMBER"; Pos = MAP_APPFONT ( 171 , 133 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -304,6 +326,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_SERIES { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_SERIES"; Pos = MAP_APPFONT ( 282 , 133 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -315,6 +338,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_ANNOTE { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_ANNOTE"; Pos = MAP_APPFONT ( 65 , 148 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -326,6 +350,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_NOTE { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_NOTE"; Pos = MAP_APPFONT ( 171 , 148 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -337,6 +362,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_URL { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_URL"; Pos = MAP_APPFONT ( 282, 148 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -348,6 +374,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_CUSTOM1 { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM1"; Pos = MAP_APPFONT ( 65 , 163 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -359,6 +386,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_CUSTOM2 { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM2"; Pos = MAP_APPFONT ( 171 , 163 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -370,6 +398,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_CUSTOM3 { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM3"; Pos = MAP_APPFONT ( 282 , 163 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -381,6 +410,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_CUSTOM4 { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM4"; Pos = MAP_APPFONT ( 65 , 177 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; @@ -392,6 +422,7 @@ ModalDialog RID_DLG_MAPPING }; ListBox LB_CUSTOM5 { + HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM5"; Pos = MAP_APPFONT ( 171 , 177 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; DropDown = TRUE; diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 77439de9c..d74678e44 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -57,6 +57,7 @@ #include <algorithm> #include <functional> #include <vector> +#include <tools/urlobj.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -463,12 +464,12 @@ void BibGeneralPage::CommitActiveControl() } //----------------------------------------------------------------------------- void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::Point& rPos, const ::Size& rSize, - String& rErrorString, String aColumnUIName, sal_uInt16 nHelpId, sal_uInt16 nIndexInFTArray ) + String& rErrorString, String aColumnUIName, const rtl::OString& sHelpId, sal_uInt16 nIndexInFTArray ) { // adds also the XControl and creates a map entry in nFT2CtrlMap[] for mapping between control and FT INT16 nIndex = -1; - uno::Reference< awt::XControlModel > xTmp = AddXControl(rColumnName, rPos, rSize, nHelpId, nIndex ); + uno::Reference< awt::XControlModel > xTmp = AddXControl(rColumnName, rPos, rSize, sHelpId, nIndex ); if( xTmp.is() ) { DBG_ASSERT( nIndexInFTArray < FIELD_COUNT, "*BibGeneralPage::AddControlWithError(): wrong array index!" ); @@ -487,7 +488,7 @@ void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::P //----------------------------------------------------------------------------- uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( const String& rName, - ::Point rPos, ::Size rSize, sal_uInt16 nHelpId, INT16& rIndex ) + ::Point rPos, ::Size rSize, const rtl::OString& sHelpId, INT16& rIndex ) { uno::Reference< awt::XControlModel > xCtrModel; try @@ -509,11 +510,10 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( rtl::OUString uProp(C2U("HelpURL")); if(xPropInfo->hasPropertyByName(uProp)) { - String sId(C2S("HID:")); - sId += String::CreateFromInt32(nHelpId); - rtl::OUString uId(sId) ; - uno::Any aVal; aVal <<= uId; - xPropSet->setPropertyValue(uProp, aVal); + ::rtl::OUString sId = ::rtl::OUString::createFromAscii( INET_HID_SCHEME ); + DBG_ASSERT( INetURLObject( rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); + sId += ::rtl::OUString( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 ); + xPropSet->setPropertyValue( uProp, makeAny( sId ) ); } if(bTypeListBox) diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index 6e4896888..a924c047b 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -140,12 +140,12 @@ class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage BibDataManager* pDatMan; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > - AddXControl( const String& rName, Point aPos, Size aSize, sal_uInt16 nHelpId, + AddXControl( const String& rName, Point aPos, Size aSize, const rtl::OString& sHelpId, sal_Int16& rIndex ); void AddControlWithError( const rtl::OUString& rColumnName, const Point& rPos, const Size& rSize, String& rErrorString, String aColumnUIName, - sal_uInt16 nHelpId, sal_uInt16 nIndexInFTArray ); + const rtl::OString& sHelpId, sal_uInt16 nIndexInFTArray ); void AdjustScrollbars(); diff --git a/extensions/source/bibliography/makefile.mk b/extensions/source/bibliography/makefile.mk index 4a0b78c2c..b681c6c90 100644 --- a/extensions/source/bibliography/makefile.mk +++ b/extensions/source/bibliography/makefile.mk @@ -88,3 +88,11 @@ DEF1NAME= $(SHL1TARGET) .INCLUDE : target.mk + +ALLTAR : $(MISC)/bib.component + +$(MISC)/bib.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + bib.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt bib.component diff --git a/extensions/source/bibliography/toolbar.src b/extensions/source/bibliography/toolbar.src index 9016a4570..35217d6b6 100644 --- a/extensions/source/bibliography/toolbar.src +++ b/extensions/source/bibliography/toolbar.src @@ -27,6 +27,7 @@ #include <svx/svxids.hrc> #include "bibliography.hrc" #include "toolbar.hrc" +#include "svx/svxcommands.h" #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; @@ -46,7 +47,6 @@ ToolBox RID_BIB_TOOLBAR ToolBoxItem { Identifier = TBC_FT_SOURCE; - //HelpID = SID_SBA_BRW_INSERT ; Text [ en-US ] = "Table"; }; ToolBoxItem @@ -63,7 +63,6 @@ ToolBox RID_BIB_TOOLBAR ToolBoxItem { Identifier = TBC_FT_QUERY; - //HelpID = SID_SBA_BRW_INSERT ; Text [ en-US ] = "Search Key"; }; ToolBoxItem @@ -90,7 +89,6 @@ ToolBox RID_BIB_TOOLBAR ToolBoxItem { Identifier = TBC_BT_FILTERCRIT ; - HelpID = SID_FM_FILTERCRIT ; // ItemBitmap = Bitmap { File = "sc10715.bmp" ; }; // Text [ de ] = "Standard Filter" ; Command = ".uno:Bib/standardFilter" ; @@ -100,7 +98,6 @@ ToolBox RID_BIB_TOOLBAR ToolBoxItem { Identifier = TBC_BT_REMOVEFILTER ; - HelpID = SID_FM_REMOVE_FILTER_SORT ; // ItemBitmap = Bitmap { File = "sc10711.bmp" ; }; Command = ".uno:Bib/removeFilter" ; Text [ en-US ] = "Remove Filter"; @@ -122,78 +119,6 @@ ToolBox RID_BIB_TOOLBAR Checkable=TRUE; Text [ en-US ] = "Data Source"; }; -/* - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = TBC_BT_NEWCARD ; - //HelpID = SID_FM_REMOVE_FILTER_SORT ; - Command = ".uno:Bib/newEntry" ; - ItemBitmap = Bitmap { File = "newcard.bmp" ; }; - Text [ en-US ] = "New Address"; - }; - - ToolBoxItem - { - Identifier = TBC_BT_EDITCARD ; - //HelpID = SID_FM_REMOVE_FILTER_SORT ; - Command = ".uno:Bib/changeEntry" ; - ItemBitmap = Bitmap { File = "modcard.bmp" ; }; - Text [ en-US ] = "Edit Address"; - }; - - ToolBoxItem - { - Identifier = TBC_BT_REMOVECARD ; - //HelpID = SID_FM_REMOVE_FILTER_SORT ; - Command = ".uno:Bib/removeEntry" ; - ItemBitmap = Bitmap { File = "remcard.bmp" ; }; - Text [ en-US ] = "Remove Address"; - }; - - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = TBC_BT_INSERT ; - HelpID = SID_SBA_BRW_INSERT ; - ItemBitmap = Bitmap { File = "sc12202.bmp" ; }; - Text [ en-US ] = "Data into Text"; - }; - ToolBoxItem - { - Identifier = TBC_BT_UPDATE ; - HelpID = SID_SBA_BRW_UPDATE ; - ItemBitmap = Bitmap { File = "sc12201.bmp" ; }; - Text = "Daten in Felder" ; - }; - - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = TBC_BT_MAIL ; - //HelpID = HID_ADDRPI_AUTOMAIL ; - ItemBitmap = Bitmap { File = "sc06305.bmp" ; }; - Text [ en-US ] = "AutoMail"; - }; - ToolBoxItem - { - Identifier = TBC_BT_URL ; - //HelpID = HID_ADDRPI_AUTOBROWSE ; - ItemBitmap = Bitmap { File = "sc06304.bmp" ; }; - Text [ en-US ] = "AutoBrowse"; - };*/ }; Scroll = TRUE ; }; diff --git a/extensions/source/config/ldap/componentdef.cxx b/extensions/source/config/ldap/componentdef.cxx index abeb75bb0..bf946c112 100644 --- a/extensions/source/config/ldap/componentdef.cxx +++ b/extensions/source/config/ldap/componentdef.cxx @@ -62,13 +62,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //------------------------------------------------------------------------------ -extern "C" sal_Bool SAL_CALL component_writeInfo(void *aServiceManager, - void *aRegistryKey) { - return cppu::component_writeInfoHelper( - aServiceManager, aRegistryKey, kImplementations_entries); -} -//------------------------------------------------------------------------------ - extern "C" void *component_getFactory(const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/extensions/source/config/ldap/exports.dxp b/extensions/source/config/ldap/exports.dxp index 9630d7e06..f0e1c6993 100644 --- a/extensions/source/config/ldap/exports.dxp +++ b/extensions/source/config/ldap/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index acb95c690..b146c0eaa 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -279,7 +279,7 @@ void LdapConnection::loadModule() { if ( !s_Ldap_Module ) { -#if defined(WIN) || defined(WNT) +#if defined(WNT) # define LIBLDAP "nsldap32v50.dll" #else # ifdef WITH_OPENLDAP diff --git a/extensions/source/config/ldap/ldapbe2.component b/extensions/source/config/ldap/ldapbe2.component new file mode 100644 index 000000000..071064d1c --- /dev/null +++ b/extensions/source/config/ldap/ldapbe2.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.backend.LdapUserProfileBe"> + <service name="com.sun.star.configuration.backend.LdapUserProfileBe"/> + </implementation> +</component> diff --git a/extensions/source/config/ldap/makefile.mk b/extensions/source/config/ldap/makefile.mk index a27cb39b6..d35e2428c 100644 --- a/extensions/source/config/ldap/makefile.mk +++ b/extensions/source/config/ldap/makefile.mk @@ -95,3 +95,11 @@ DEF1DES=Configuration: LDAP User Profile Backend .INCLUDE : target.mk .INCLUDE : $(PRJ)$/util$/target.pmk + +ALLTAR : $(MISC)/ldapbe2.component + +$(MISC)/ldapbe2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ldapbe2.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt ldapbe2.component diff --git a/extensions/source/dbpilots/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src index 783bdb48b..fd2bef2f4 100644 --- a/extensions/source/dbpilots/commonpagesdbp.src +++ b/extensions/source/dbpilots/commonpagesdbp.src @@ -31,6 +31,7 @@ TabPage RID_PAGE_TABLESELECTION { + HelpID = "extensions:TabPage:RID_PAGE_TABLESELECTION"; SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; Text [ en-US ] = "Data"; @@ -58,6 +59,7 @@ TabPage RID_PAGE_TABLESELECTION }; ListBox LB_DATASOURCE { + HelpID = "extensions:ListBox:RID_PAGE_TABLESELECTION:LB_DATASOURCE"; Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 26 ) ; Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 27 , 14 ) ; SVLook = TRUE ; @@ -68,6 +70,7 @@ TabPage RID_PAGE_TABLESELECTION PushButton PB_FORMDATASOURCE { + HelpID = "extensions:PushButton:RID_PAGE_TABLESELECTION:PB_FORMDATASOURCE"; Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 + WINDOW_HALF_SIZE_X - 24 , 25 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text [ en-US ] = "~..."; @@ -82,6 +85,7 @@ TabPage RID_PAGE_TABLESELECTION }; ListBox LB_TABLE { + HelpID = "extensions:ListBox:RID_PAGE_TABLESELECTION:LB_TABLE"; Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3, 57 ) ; Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10 , WINDOW_SIZE_Y - 6 - 57 ) ; SVLook = TRUE ; @@ -118,6 +122,7 @@ TabPage RID_PAGE_TABLESELECTION TabPage RID_PAGE_OPTION_DBFIELD { + HelpID = "extensions:TabPage:RID_PAGE_OPTION_DBFIELD"; SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; Text [ en-US ] = "Database Field"; @@ -142,6 +147,7 @@ TabPage RID_PAGE_OPTION_DBFIELD }; RadioButton RB_STOREINFIELD_YES { + HelpID = "extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_YES"; Pos = MAP_APPFONT ( 7 , 53 ) ; Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 20, 10 ) ; Group = TRUE; @@ -150,6 +156,7 @@ TabPage RID_PAGE_OPTION_DBFIELD }; ListBox LB_STOREINFIELD { + HelpID = "extensions:ListBox:RID_PAGE_OPTION_DBFIELD:LB_STOREINFIELD"; Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 23, 51 ) ; Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 30, 14 ) ; TabStop = TRUE; @@ -160,6 +167,7 @@ TabPage RID_PAGE_OPTION_DBFIELD }; RadioButton RB_STOREINFIELD_NO { + HelpID = "extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_NO"; Pos = MAP_APPFONT ( 7 , 68 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 10 ) ; TabStop = FALSE; @@ -169,6 +177,7 @@ TabPage RID_PAGE_OPTION_DBFIELD TabPage RID_PAGE_FORM_DATASOURCE_STATUS { + HelpID = "extensions:TabPage:RID_PAGE_FORM_DATASOURCE_STATUS"; FixedLine FL_FORMSETINGS { Pos = MAP_APPFONT ( 4 , 3 ) ; diff --git a/extensions/source/dbpilots/dbp.component b/extensions/source/dbpilots/dbp.component new file mode 100644 index 000000000..84ec98713 --- /dev/null +++ b/extensions/source/dbpilots/dbp.component @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="org.openoffice.comp.dbp.OGridWizard"> + <service name="com.sun.star.sdb.GridControlAutoPilot"/> + </implementation> + <implementation name="org.openoffice.comp.dbp.OGroupBoxWizard"> + <service name="com.sun.star.sdb.GroupBoxAutoPilot"/> + </implementation> + <implementation name="org.openoffice.comp.dbp.OListComboWizard"> + <service name="com.sun.star.sdb.ListComboBoxAutoPilot"/> + </implementation> +</component> diff --git a/extensions/source/dbpilots/dbpilots.src b/extensions/source/dbpilots/dbpilots.src index fcdda32e0..7e5cf6adf 100644 --- a/extensions/source/dbpilots/dbpilots.src +++ b/extensions/source/dbpilots/dbpilots.src @@ -31,6 +31,7 @@ ModalDialog RID_DLG_GROUPBOXWIZARD { + HelpID = "extensions:ModalDialog:RID_DLG_GROUPBOXWIZARD"; Text [ en-US ] = "Group Element Wizard"; OutputSize = TRUE ; @@ -42,6 +43,7 @@ ModalDialog RID_DLG_GROUPBOXWIZARD ModalDialog RID_DLG_LISTCOMBOWIZARD { + HelpID = "extensions:ModalDialog:RID_DLG_LISTCOMBOWIZARD"; OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; @@ -51,6 +53,7 @@ ModalDialog RID_DLG_LISTCOMBOWIZARD ModalDialog RID_DLG_GRIDWIZARD { + HelpID = "extensions:ModalDialog:RID_DLG_GRIDWIZARD"; OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc index 81f61d49c..7d766516c 100644 --- a/extensions/source/dbpilots/dbpresid.hrc +++ b/extensions/source/dbpilots/dbpresid.hrc @@ -29,6 +29,7 @@ #define _EXTENSIONS_DBP_DBPRESID_HRC_ #include "dbpilots.hrc" +#include "extensio.hrc" //======================================================================== // basics diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx index b7e63c663..726049977 100644 --- a/extensions/source/dbpilots/dbpservices.cxx +++ b/extensions/source/dbpilots/dbpservices.cxx @@ -70,27 +70,6 @@ component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* pServiceManager, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - return ::dbp::OModule::writeComponentInfos( - static_cast<XMultiServiceFactory*>(pServiceManager), - static_cast<XRegistryKey*>(pRegistryKey)); - } - catch (InvalidRegistryException& ) - { - OSL_ASSERT("dbp::component_writeInfo: could not create a registry key (InvalidRegistryException) !"); - } - - return sal_False; -} - -//--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/extensions/source/dbpilots/gridpages.src b/extensions/source/dbpilots/gridpages.src index 5b5d557ca..ccba53592 100644 --- a/extensions/source/dbpilots/gridpages.src +++ b/extensions/source/dbpilots/gridpages.src @@ -31,6 +31,7 @@ TabPage RID_PAGE_GW_FIELDSELECTION { + HelpID = "extensions:TabPage:RID_PAGE_GW_FIELDSELECTION"; SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; @@ -51,6 +52,7 @@ TabPage RID_PAGE_GW_FIELDSELECTION }; ListBox LB_EXISTING_FIELDS { + HelpID = "extensions:ListBox:RID_PAGE_GW_FIELDSELECTION:LB_EXISTING_FIELDS"; Pos = MAP_APPFONT ( 7 , 63 ) ; Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 - 13, WINDOW_SIZE_Y - 63 - 6 ) ; SVLook = TRUE ; @@ -61,24 +63,28 @@ TabPage RID_PAGE_GW_FIELDSELECTION }; PushButton PB_FIELDRIGHT { + HelpID = "extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_FIELDRIGHT"; Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2, 63 ); Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X, ITEM_BUTTON_SIZE_Y ); Text = "->"; }; PushButton PB_ALLFIELDSRIGHT { + HelpID = "extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_ALLFIELDSRIGHT"; Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2, 63 + ITEM_BUTTON_SIZE_Y + 3 ); Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X, ITEM_BUTTON_SIZE_Y ); Text = "=>>"; }; PushButton PB_FIELDLEFT { + HelpID = "extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_FIELDLEFT"; Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2, 63 + ITEM_BUTTON_SIZE_Y + 3 + ITEM_BUTTON_SIZE_Y + 12 ); Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X, ITEM_BUTTON_SIZE_Y ); Text = "<-"; }; PushButton PB_ALLFIELDSLEFT { + HelpID = "extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_ALLFIELDSLEFT"; Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2, 63 + ITEM_BUTTON_SIZE_Y + 3 + ITEM_BUTTON_SIZE_Y + 12 + ITEM_BUTTON_SIZE_Y + 3 ); Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X, ITEM_BUTTON_SIZE_Y ); Text = "<<="; @@ -91,6 +97,7 @@ TabPage RID_PAGE_GW_FIELDSELECTION }; ListBox LB_SELECTED_FIELDS { + HelpID = "extensions:ListBox:RID_PAGE_GW_FIELDSELECTION:LB_SELECTED_FIELDS"; Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + ITEM_BUTTON_SIZE_X / 2 + 6 , 63 ) ; Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 - 13, WINDOW_SIZE_Y - 63 - 6 ) ; SVLook = TRUE ; diff --git a/extensions/source/dbpilots/groupboxpages.src b/extensions/source/dbpilots/groupboxpages.src index f5538e2a1..11f77711c 100644 --- a/extensions/source/dbpilots/groupboxpages.src +++ b/extensions/source/dbpilots/groupboxpages.src @@ -31,6 +31,7 @@ TabPage RID_PAGE_GROUPRADIOSELECTION { + HelpID = "extensions:TabPage:RID_PAGE_GROUPRADIOSELECTION"; SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; Text [ en-US ] = "Data"; @@ -50,6 +51,7 @@ TabPage RID_PAGE_GROUPRADIOSELECTION }; Edit ET_RADIOLABELS { + HelpID = "extensions:Edit:RID_PAGE_GROUPRADIOSELECTION:ET_RADIOLABELS"; Pos = MAP_APPFONT ( 7 , 79 ) ; Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 - 13, 12 ) ; SVLook = TRUE ; @@ -57,12 +59,14 @@ TabPage RID_PAGE_GROUPRADIOSELECTION }; PushButton PB_MOVETORIGHT { + HelpID = "extensions:PushButton:RID_PAGE_GROUPRADIOSELECTION:PB_MOVETORIGHT"; Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 , 79 ) ; Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X , ITEM_BUTTON_SIZE_Y ) ; Text = "~>>"; }; PushButton PB_MOVETOLEFT { + HelpID = "extensions:PushButton:RID_PAGE_GROUPRADIOSELECTION:PB_MOVETOLEFT"; Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 , 79 + ITEM_BUTTON_SIZE_Y + 3 ) ; Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X , ITEM_BUTTON_SIZE_Y ) ; Text = "~<<"; @@ -76,6 +80,7 @@ TabPage RID_PAGE_GROUPRADIOSELECTION }; ListBox LB_RADIOBUTTONS { + HelpID = "extensions:ListBox:RID_PAGE_GROUPRADIOSELECTION:LB_RADIOBUTTONS"; Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + ITEM_BUTTON_SIZE_X / 2 + 6 , 79 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 - 6 - 7, WINDOW_SIZE_Y - 79 - 6 ) ; SVLook = TRUE ; @@ -87,6 +92,7 @@ TabPage RID_PAGE_GROUPRADIOSELECTION TabPage RID_PAGE_DEFAULTFIELDSELECTION { + HelpID = "extensions:TabPage:RID_PAGE_DEFAULTFIELDSELECTION"; SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; Text [ en-US ] = "Default Field Selection"; @@ -106,6 +112,7 @@ TabPage RID_PAGE_DEFAULTFIELDSELECTION }; RadioButton RB_DEFSELECTION_YES { + HelpID = "extensions:RadioButton:RID_PAGE_DEFAULTFIELDSELECTION:RB_DEFSELECTION_YES"; Pos = MAP_APPFONT ( 7 , 44 ) ; Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 10 ) ; Group = TRUE; @@ -114,6 +121,7 @@ TabPage RID_PAGE_DEFAULTFIELDSELECTION }; ListBox LB_DEFSELECTIONFIELD { + HelpID = "extensions:ListBox:RID_PAGE_DEFAULTFIELDSELECTION:LB_DEFSELECTIONFIELD"; Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 42 ) ; Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 14 ) ; TabStop = TRUE; @@ -125,6 +133,7 @@ TabPage RID_PAGE_DEFAULTFIELDSELECTION }; RadioButton RB_DEFSELECTION_NO { + HelpID = "extensions:RadioButton:RID_PAGE_DEFAULTFIELDSELECTION:RB_DEFSELECTION_NO"; Pos = MAP_APPFONT ( 7 , 59 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 10 ) ; TabStop = FALSE; @@ -134,6 +143,7 @@ TabPage RID_PAGE_DEFAULTFIELDSELECTION TabPage RID_PAGE_OPTIONVALUES { + HelpID = "extensions:TabPage:RID_PAGE_OPTIONVALUES"; SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; Text [ en-US ] = "Field Values"; @@ -160,6 +170,7 @@ TabPage RID_PAGE_OPTIONVALUES }; Edit ET_OPTIONVALUE { + HelpID = "extensions:Edit:RID_PAGE_OPTIONVALUES:ET_OPTIONVALUE"; Pos = MAP_APPFONT ( 7 , 61 ) ; Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 12 ) ; SVLook = TRUE ; @@ -174,6 +185,7 @@ TabPage RID_PAGE_OPTIONVALUES }; ListBox LB_RADIOBUTTONS { + HelpID = "extensions:ListBox:RID_PAGE_OPTIONVALUES:LB_RADIOBUTTONS"; Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 26 ) ; Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10 , WINDOW_SIZE_Y - 32 ) ; SVLook = TRUE ; @@ -185,6 +197,7 @@ TabPage RID_PAGE_OPTIONVALUES TabPage RID_PAGE_OPTIONS_FINAL { + HelpID = "extensions:TabPage:RID_PAGE_OPTIONS_FINAL"; SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; Text [ en-US ] = "Create Option Group"; @@ -203,6 +216,7 @@ TabPage RID_PAGE_OPTIONS_FINAL }; Edit ET_NAMEIT { + HelpID = "extensions:Edit:RID_PAGE_OPTIONS_FINAL:ET_NAMEIT"; Pos = MAP_APPFONT ( 7 , 34 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 12 ) ; SVLook = TRUE ; diff --git a/extensions/source/dbpilots/listcombopages.src b/extensions/source/dbpilots/listcombopages.src index 7e48fef2c..dd8603502 100644 --- a/extensions/source/dbpilots/listcombopages.src +++ b/extensions/source/dbpilots/listcombopages.src @@ -31,6 +31,7 @@ TabPage RID_PAGE_LCW_CONTENTSELECTION_TABLE { + HelpID = "extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_TABLE"; SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; @@ -53,6 +54,7 @@ TabPage RID_PAGE_LCW_CONTENTSELECTION_TABLE }; ListBox LB_SELECTTABLE { + HelpID = "extensions:ListBox:RID_PAGE_LCW_CONTENTSELECTION_TABLE:LB_SELECTTABLE"; Pos = MAP_APPFONT ( 130 , 52 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 130 - 7, WINDOW_SIZE_Y - 52 - 6 ) ; SVLook = TRUE ; @@ -65,6 +67,7 @@ TabPage RID_PAGE_LCW_CONTENTSELECTION_TABLE TabPage RID_PAGE_LCW_CONTENTSELECTION_FIELD { + HelpID = "extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_FIELD"; SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; @@ -86,6 +89,7 @@ TabPage RID_PAGE_LCW_CONTENTSELECTION_FIELD }; ListBox LB_SELECTFIELD { + HelpID = "extensions:ListBox:RID_PAGE_LCW_CONTENTSELECTION_FIELD:LB_SELECTFIELD"; Pos = MAP_APPFONT ( 7 , 26 ) ; Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y - 32 ) ; SVLook = TRUE ; @@ -102,6 +106,7 @@ TabPage RID_PAGE_LCW_CONTENTSELECTION_FIELD }; Edit ET_DISPLAYEDFIELD { + HelpID = "extensions:Edit:RID_PAGE_LCW_CONTENTSELECTION_FIELD:ET_DISPLAYEDFIELD"; Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 26 ) ; Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 12 ) ; SVLook = TRUE ; @@ -127,6 +132,7 @@ TabPage RID_PAGE_LCW_CONTENTSELECTION_FIELD TabPage RID_PAGE_LCW_FIELDLINK { + HelpID = "extensions:TabPage:RID_PAGE_LCW_FIELDLINK"; SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; @@ -153,6 +159,7 @@ TabPage RID_PAGE_LCW_FIELDLINK }; ComboBox CMB_VALUELISTFIELD { + HelpID = "extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_VALUELISTFIELD"; Pos = MAP_APPFONT ( 7 , 48 ) ; Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y - 54 ) ; SVLook = TRUE ; @@ -170,6 +177,7 @@ TabPage RID_PAGE_LCW_FIELDLINK }; ComboBox CMB_TABLEFIELD { + HelpID = "extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_TABLEFIELD"; Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 48 ) ; Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y - 54 ) ; SVLook = TRUE ; diff --git a/extensions/source/dbpilots/makefile.mk b/extensions/source/dbpilots/makefile.mk index b5831e5fd..e37ab0a54 100644 --- a/extensions/source/dbpilots/makefile.mk +++ b/extensions/source/dbpilots/makefile.mk @@ -101,3 +101,11 @@ DEF1NAME= $(SHL1TARGET) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/dbp.component + +$(MISC)/dbp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + dbp.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt dbp.component diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx index cbcb0cec1..0a9f4bb76 100644 --- a/extensions/source/inc/componentmodule.cxx +++ b/extensions/source/inc/componentmodule.cxx @@ -238,54 +238,6 @@ namespace COMPMOD_NAMESPACE } //-------------------------------------------------------------------------- - sal_Bool OModule::writeComponentInfos( - const Reference< XMultiServiceFactory >& /*_rxServiceManager*/, - const Reference< XRegistryKey >& _rxRootKey) - { - OSL_ENSURE(_rxRootKey.is(), "OModule::writeComponentInfos : invalid argument !"); - - if (!s_pImplementationNames) - { - OSL_ASSERT("OModule::writeComponentInfos : have no class infos ! Are you sure called this method at the right time ?"); - return sal_True; - } - OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, - "OModule::writeComponentInfos : inconsistent state (the pointers) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), - "OModule::writeComponentInfos : inconsistent state !"); - - sal_Int32 nLen = s_pImplementationNames->getLength(); - const ::rtl::OUString* pImplName = s_pImplementationNames->getConstArray(); - const Sequence< ::rtl::OUString >* pServices = s_pSupportedServices->getConstArray(); - - ::rtl::OUString sRootKey("/", 1, RTL_TEXTENCODING_ASCII_US); - for (sal_Int32 i=0; i<nLen; ++i, ++pImplName, ++pServices) - { - ::rtl::OUString aMainKeyName(sRootKey); - aMainKeyName += *pImplName; - aMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES"); - - try - { - Reference< XRegistryKey > xNewKey( _rxRootKey->createKey(aMainKeyName) ); - - const ::rtl::OUString* pService = pServices->getConstArray(); - for (sal_Int32 j=0; j<pServices->getLength(); ++j, ++pService) - xNewKey->createKey(*pService); - } - catch(Exception&) - { - OSL_ASSERT("OModule::writeComponentInfos : something went wrong while creating the keys !"); - return sal_False; - } - } - - return sal_True; - } - - //-------------------------------------------------------------------------- Reference< XInterface > OModule::getComponentFactory( const ::rtl::OUString& _rImplementationName, const Reference< XMultiServiceFactory >& _rxServiceManager) diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx index 741903e50..268aa9ce0 100644 --- a/extensions/source/inc/componentmodule.hxx +++ b/extensions/source/inc/componentmodule.hxx @@ -121,21 +121,6 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService static void revokeComponent( const ::rtl::OUString& _rImplementationName); - /** write the registration information of all known components - <p>writes the registration information of all components which are currently registered into the - specified registry.<p/> - <p>Usually used from within component_writeInfo.<p/> - @param _rxServiceManager - the service manager - @param _rRootKey - the registry key under which the information will be stored - @return - sal_True if the registration of all implementations was successfull, sal_False otherwise - */ - static sal_Bool writeComponentInfos( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager, - const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rRootKey); - /** creates a Factory for the component with the given implementation name. <p>Usually used from within component_getFactory.<p/> @param _rxServiceManager diff --git a/extensions/source/logging/log.component b/extensions/source/logging/log.component new file mode 100644 index 000000000..4dd2db56c --- /dev/null +++ b/extensions/source/logging/log.component @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.extensions.ConsoleHandler"> + <service name="com.sun.star.logging.ConsoleHandler"/> + </implementation> + <implementation name="com.sun.star.comp.extensions.CsvFormatter"> + <service name="com.sun.star.logging.CsvFormatter"/> + </implementation> + <implementation name="com.sun.star.comp.extensions.FileHandler"> + <service name="com.sun.star.logging.FileHandler"/> + </implementation> + <implementation name="com.sun.star.comp.extensions.LoggerPool"> + <service name="com.sun.star.logging.LoggerPool"/> + <singleton name="com.sun.star.logging.LoggerPool"/> + </implementation> + <implementation name="com.sun.star.comp.extensions.PlainTextFormatter"> + <service name="com.sun.star.logging.PlainTextFormatter"/> + </implementation> +</component> diff --git a/extensions/source/logging/makefile.mk b/extensions/source/logging/makefile.mk index 4a1fa9813..1436576e8 100644 --- a/extensions/source/logging/makefile.mk +++ b/extensions/source/logging/makefile.mk @@ -74,3 +74,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map .INCLUDE : target.mk + +ALLTAR : $(MISC)/log.component + +$(MISC)/log.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + log.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt log.component diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx index 325c64cf8..7544c5ab0 100644 --- a/extensions/source/nsplugin/source/so_env.cxx +++ b/extensions/source/nsplugin/source/so_env.cxx @@ -204,7 +204,9 @@ int nspluginOOoModuleHook (void** aResult) strcpy (realFileName, libFileName); } + #if OSL_DEBUG_LEVEL > 1 fprintf (stderr, "OpenOffice path before fixup is '%s'\n", realFileName); + #endif if (realFileName[0] != '/') { /* a relative sym-link and we need to get an absolute path */ @@ -223,7 +225,9 @@ int nspluginOOoModuleHook (void** aResult) *aResult = realFileName; + #if OSL_DEBUG_LEVEL > 1 fprintf (stderr, "OpenOffice path is '%s'\n", realFileName); + #endif return 0; } diff --git a/extensions/source/ole/makefile.mk b/extensions/source/ole/makefile.mk index ad4ecee72..806cd027e 100644 --- a/extensions/source/ole/makefile.mk +++ b/extensions/source/ole/makefile.mk @@ -129,3 +129,10 @@ DEF2EXPORTFILE=$(TARGET).dxp .INCLUDE : target.mk +ALLTAR : $(MISC)/oleautobridge.component + +$(MISC)/oleautobridge.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt oleautobridge.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt oleautobridge.component diff --git a/extensions/source/ole/oleautobridge.component b/extensions/source/ole/oleautobridge.component new file mode 100644 index 000000000..6f5309e42 --- /dev/null +++ b/extensions/source/ole/oleautobridge.component @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.ole.OleClient"> + <service name="com.sun.star.bridge.OleObjectFactory"/> + <service name="com.sun.star.bridge.oleautomation.Factory"/> + </implementation> + <implementation name="com.sun.star.comp.ole.OleConverter2"> + <service name="com.sun.star.bridge.OleBridgeSupplier2"/> + <service name="com.sun.star.bridge.oleautomation.BridgeSupplier"/> + </implementation> + <implementation name="com.sun.star.comp.ole.OleConverterVar1"> + <service name="com.sun.star.bridge.OleBridgeSupplierVar1"/> + </implementation> + <implementation name="com.sun.star.comp.ole.OleServer"> + <service name="com.sun.star.bridge.OleApplicationRegistration"/> + <service name="com.sun.star.bridge.oleautomation.ApplicationRegistration"/> + </implementation> +</component> diff --git a/extensions/source/ole/oleautobridge.uno.dxp b/extensions/source/ole/oleautobridge.uno.dxp index e7947188a..1f26fd019 100644 --- a/extensions/source/ole/oleautobridge.uno.dxp +++ b/extensions/source/ole/oleautobridge.uno.dxp @@ -1,4 +1,3 @@ -component_writeInfo @100 component_getFactory @101 component_getImplementationEnvironment @102 component_canUnload @103 diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 1aadd37b2..7a73ed7e6 100644..100755 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -69,6 +69,7 @@ using namespace boost; using namespace osl; using namespace rtl; using namespace cppu; +using namespace com::sun::star::script; using namespace com::sun::star::lang; using namespace com::sun::star::bridge; using namespace com::sun::star::bridge::oleautomation; @@ -108,7 +109,7 @@ IUnknownWrapper_Impl::IUnknownWrapper_Impl( Reference<XMultiServiceFactory>& xFa sal_uInt8 unoWrapperClass, sal_uInt8 comWrapperClass): UnoConversionUtilities<IUnknownWrapper_Impl>( xFactory, unoWrapperClass, comWrapperClass), m_pxIdlClass( NULL), m_eJScript( JScriptUndefined), - m_bComTlbIndexInit(false) + m_bComTlbIndexInit(false), m_bHasDfltMethod(false), m_bHasDfltProperty(false) { } @@ -147,17 +148,15 @@ IUnknownWrapper_Impl::~IUnknownWrapper_Impl() Any IUnknownWrapper_Impl::queryInterface(const Type& t) throw (RuntimeException) { - if (t == getCppuType(static_cast<Reference<XInvocation>*>( 0))) - { - if (m_spDispatch) - return WeakImplHelper4<XInvocation, XBridgeSupplier2, - XInitialization, XAutomationObject>::queryInterface(t); - else - return Any(); - } - - return WeakImplHelper4<XInvocation, XBridgeSupplier2, - XInitialization, XAutomationObject>::queryInterface(t); + if (t == getCppuType(static_cast<Reference<XDefaultMethod>*>( 0)) && !m_bHasDfltMethod ) + return Any(); + if (t == getCppuType(static_cast<Reference<XDefaultProperty>*>( 0)) && !m_bHasDfltProperty ) + return Any(); + if (t == getCppuType(static_cast<Reference<XInvocation>*>( 0)) && !m_spDispatch) + return Any(); + + return WeakImplHelper6<XInvocation, XBridgeSupplier2, + XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod>::queryInterface(t); } Reference<XIntrospectionAccess> SAL_CALL IUnknownWrapper_Impl::getIntrospection(void) @@ -1194,6 +1193,68 @@ void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArgument aArguments[1] >>= m_bOriginalDispatch; aArguments[2] >>= m_seqTypes; + + ITypeInfo* pType = NULL; + try + { + // a COM object implementation that has no TypeInfo is still a legal COM object; + // such objects can at least be transported through UNO using the bridge + // so we should allow to create wrappers for them as well + pType = getTypeInfo(); + } + catch( BridgeRuntimeError& ) + {} + catch( Exception& ) + {} + + if ( pType ) + { + try + { + // Get Default member + CComBSTR defaultMemberName; + if ( SUCCEEDED( pType->GetDocumentation(0, &defaultMemberName, 0, 0, 0 ) ) ) + { + OUString usName(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(defaultMemberName))); + FuncDesc aDescGet(pType); + FuncDesc aDescPut(pType); + VarDesc aVarDesc(pType); + // see if this is a property first ( more likely to be a property then a method ) + getPropDesc( usName, & aDescGet, & aDescPut, & aVarDesc); + + if ( !aDescGet && !aDescPut ) + { + getFuncDesc( usName, &aDescGet ); + if ( !aDescGet ) + throw BridgeRuntimeError( OUSTR("[automation bridge]IUnknownWrapper_Impl::initialize() Failed to get Function or Property desc. for " ) + usName ); + } + // now for some funny heuristics to make basic understand what to do + // a single aDescGet ( that doesn't take any params ) would be + // a read only ( defaultmember ) property e.g. this object + // should implement XDefaultProperty + // a single aDescGet ( that *does* ) take params is basically a + // default method e.g. implement XDefaultMethod + + // a DescPut ( I guess we only really support a default param with '1' param ) as a setValue ( but I guess we can leave it through, the object will fail if we don't get it right anyway ) + if ( aDescPut || ( aDescGet && aDescGet->cParams == 0 ) ) + m_bHasDfltProperty = true; + if ( aDescGet->cParams > 0 ) + m_bHasDfltMethod = true; + if ( m_bHasDfltProperty || m_bHasDfltMethod ) + m_sDefaultMember = usName; + } + } + catch ( BridgeRuntimeError & e ) + { + throw RuntimeException( e.message, Reference<XInterface>() ); + } + catch( Exception& e ) + { + throw RuntimeException( + OUSTR("[automation bridge] unexpected exception in IUnknownWrapper_Impl::initialiase() error message: \n") + e.Message, + Reference<XInterface>() ); + } + } } // UnoConversionUtilities -------------------------------------------------------------------------------- @@ -1445,6 +1506,9 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(const OUString& sFuncName, arDispidNamedArgs.reset(new DISPID[nSizeAr]); HRESULT hr = getTypeInfo()->GetIDsOfNames(arNames, nSizeAr, arDispidNamedArgs.get()); + if ( hr == E_NOTIMPL ) + hr = m_spDispatch->GetIDsOfNames(IID_NULL, arNames, nSizeAr, LOCALE_USER_DEFAULT, arDispidNamedArgs.get() ); + if (hr == S_OK) { // In a "property put" operation, the property value is a named param with the diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx index dfc88a50c..334fb18e5 100644 --- a/extensions/source/ole/oleobjw.hxx +++ b/extensions/source/ole/oleobjw.hxx @@ -50,11 +50,14 @@ #endif #include <cppuhelper/implbase3.hxx> #include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase6.hxx> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp> #include <rtl/ustring.hxx> +#include <com/sun/star/script/XDefaultProperty.hpp> +#include <com/sun/star/script/XDefaultMethod.hpp> #include <typelib/typedescription.hxx> #include "unoconversionutilities.hxx" @@ -78,7 +81,8 @@ typedef hash_multimap<OUString, unsigned int, hashOUString_Impl, equalOUString_I // This class wraps an IDispatch and maps XInvocation calls to IDispatch calls on the wrapped object. // If m_TypeDescription is set then this class represents an UNO interface implemented in a COM component. // The interface is not a real interface in terms of an abstract class but is realized through IDispatch. -class IUnknownWrapper_Impl : public WeakImplHelper4<XInvocation, XBridgeSupplier2, XInitialization, XAutomationObject>, +class IUnknownWrapper_Impl : public WeakImplHelper6<XInvocation, XBridgeSupplier2, XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod>, + public UnoConversionUtilities<IUnknownWrapper_Impl> { @@ -126,8 +130,10 @@ public: // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException); + virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; } protected: - + virtual ::rtl::OUString SAL_CALL getDefaultMethodName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; } + // ---------------------------------------------------------------------------- virtual Any invokeWithDispIdUnoTlb(const OUString& sFunctionName, const Sequence< Any >& Params, @@ -253,6 +259,9 @@ protected: bool m_bComTlbIndexInit; // Keeps the ITypeInfo obtained from IDispatch::GetTypeInfo CComPtr< ITypeInfo > m_spTypeInfo; + rtl::OUString m_sDefaultMember; + bool m_bHasDfltMethod; + bool m_bHasDfltProperty; }; } // end namespace diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx index a0bd98e33..f43b4f6bf 100644 --- a/extensions/source/ole/servreg.cxx +++ b/extensions/source/ole/servreg.cxx @@ -119,47 +119,6 @@ extern "C" void * SAL_CALL component_getFactory( } -extern "C" sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - //deprecated - Reference<XRegistryKey> xNewKey = - reinterpret_cast<XRegistryKey*>( pRegistryKey)->createKey(reinterpret_cast<const sal_Unicode*>(L"/com.sun.star.comp.ole.OleConverter2/UNO/SERVICES")); - xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.OleBridgeSupplier2")); - - xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.oleautomation.BridgeSupplier")); - - //deprecated - xNewKey = - reinterpret_cast<XRegistryKey*>( pRegistryKey)->createKey(reinterpret_cast<const sal_Unicode*>(L"/com.sun.star.comp.ole.OleConverterVar1/UNO/SERVICES")); - xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.OleBridgeSupplierVar1")); - - //deprecated - xNewKey = - reinterpret_cast<XRegistryKey*>( pRegistryKey)->createKey(reinterpret_cast<const sal_Unicode*>(L"/com.sun.star.comp.ole.OleClient/UNO/SERVICES")); - xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.OleObjectFactory")); - - xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.oleautomation.Factory")); - //deprecated - xNewKey = - reinterpret_cast<XRegistryKey*>( pRegistryKey)->createKey(reinterpret_cast<const sal_Unicode*>(L"/com.sun.star.comp.ole.OleServer/UNO/SERVICES")); - xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.OleApplicationRegistration")); - - xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.oleautomation.ApplicationRegistration")); - - return sal_True; - } - catch (InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - return sal_False; -} - extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index e8eb3ad6f..1fec67353 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -1324,33 +1324,47 @@ SAFEARRAY* UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq) typelib_TypeDescription* pSeqElementDesc= NULL; TYPELIB_DANGER_GET( &pSeqElementDesc, pSeqElementTypeRef); - sal_Int32 nElementSize= pSeqElementDesc->nSize; - n= punoSeq->nElements; - - SAFEARRAYBOUND rgsabound[1]; - rgsabound[0].lLbound = 0; - rgsabound[0].cElements = n; - VARIANT oleElement; - long safeI[1]; - - pArray = SafeArrayCreate(VT_VARIANT, 1, rgsabound); - - Any unoElement; - // sal_uInt8 * pSeqData= (sal_uInt8*) punoSeq->pElements; - sal_uInt8 * pSeqData= (sal_uInt8*) punoSeq->elements; - - for (sal_uInt32 i = 0; i < n; i++) + + // try to find VARIANT type that is related to the UNO type of the sequence elements + // the sequence as a sequence element should be handled in a special way + VARTYPE eTargetElementType = VT_EMPTY; + if ( pSeqElementDesc->eTypeClass != TypeClass_SEQUENCE ) + eTargetElementType = mapTypeClassToVartype( static_cast< TypeClass >( pSeqElementDesc->eTypeClass ) ); + + if ( eTargetElementType != VT_EMPTY ) + pArray = createUnoSequenceWrapper( rSeq, eTargetElementType ); + + if ( !pArray ) { - unoElement.setValue( pSeqData + i * nElementSize, pSeqElementDesc); - VariantInit(&oleElement); + sal_Int32 nElementSize= pSeqElementDesc->nSize; + n= punoSeq->nElements; - anyToVariant(&oleElement, unoElement); + SAFEARRAYBOUND rgsabound[1]; + rgsabound[0].lLbound = 0; + rgsabound[0].cElements = n; + VARIANT oleElement; + long safeI[1]; - safeI[0] = i; - SafeArrayPutElement(pArray, safeI, &oleElement); + pArray = SafeArrayCreate(VT_VARIANT, 1, rgsabound); - VariantClear(&oleElement); + Any unoElement; + // sal_uInt8 * pSeqData= (sal_uInt8*) punoSeq->pElements; + sal_uInt8 * pSeqData= (sal_uInt8*) punoSeq->elements; + + for (sal_uInt32 i = 0; i < n; i++) + { + unoElement.setValue( pSeqData + i * nElementSize, pSeqElementDesc); + VariantInit(&oleElement); + + anyToVariant(&oleElement, unoElement); + + safeI[0] = i; + SafeArrayPutElement(pArray, safeI, &oleElement); + + VariantClear(&oleElement); + } } + TYPELIB_DANGER_RELEASE( pSeqElementDesc); return pArray; diff --git a/extensions/source/oooimprovecore/makefile.mk b/extensions/source/oooimprovecore/makefile.mk index 97e130c3a..f92804dbf 100644 --- a/extensions/source/oooimprovecore/makefile.mk +++ b/extensions/source/oooimprovecore/makefile.mk @@ -75,3 +75,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map .INCLUDE : target.mk + +ALLTAR : $(MISC)/oooimprovecore.component + +$(MISC)/oooimprovecore.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt oooimprovecore.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt oooimprovecore.component diff --git a/extensions/source/oooimprovecore/oooimprovecore.component b/extensions/source/oooimprovecore/oooimprovecore.component new file mode 100644 index 000000000..58bdaf37c --- /dev/null +++ b/extensions/source/oooimprovecore/oooimprovecore.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.extensions.oooimprovecore.Core"> + <service name="com.sun.star.oooimprovement.Core"/> + </implementation> +</component> diff --git a/extensions/source/oooimprovement/invite_job.cxx b/extensions/source/oooimprovement/invite_job.cxx index 77cef48ce..74204cdb2 100644 --- a/extensions/source/oooimprovement/invite_job.cxx +++ b/extensions/source/oooimprovement/invite_job.cxx @@ -121,7 +121,7 @@ namespace oooimprovement Sequence<OUString> SAL_CALL InviteJob::getSupportedServiceNames_static() { Sequence<OUString> aServiceNames(1); - aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.XAsyncJob"); + aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.AsyncJob"); return aServiceNames; } diff --git a/extensions/source/oooimprovement/makefile.mk b/extensions/source/oooimprovement/makefile.mk index 6e5d7ab0d..16e3f12f1 100644 --- a/extensions/source/oooimprovement/makefile.mk +++ b/extensions/source/oooimprovement/makefile.mk @@ -102,3 +102,11 @@ $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-oooimprovement.xcu : $(XCU_SOURCEDIR)$/Jo $(SPOOLDIR)$/$(PACKAGEDIR)$/Logging$/Logging-oooimprovement.xcu : $(XCU_SOURCEDIR)$/Logging.xcu @-$(MKDIRHIER) $(@:d) @$(COPY) $< $@ + +ALLTAR : $(MISC)/oooimprovement.component + +$(MISC)/oooimprovement.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt oooimprovement.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt oooimprovement.component diff --git a/extensions/source/oooimprovement/onlogrotate_job.cxx b/extensions/source/oooimprovement/onlogrotate_job.cxx index 9ee771aa9..42dc001ed 100644 --- a/extensions/source/oooimprovement/onlogrotate_job.cxx +++ b/extensions/source/oooimprovement/onlogrotate_job.cxx @@ -35,15 +35,21 @@ #include "soapsender.hxx" #include <com/sun/star/ucb/XSimpleFileAccess.hpp> +#include <com/sun/star/frame/XDesktop.hpp> +#include <com/sun/star/frame/XTerminateListener.hpp> #include <osl/mutex.hxx> #include <osl/thread.hxx> #include <osl/time.h> +#include <cppuhelper/implbase1.hxx> +#include <memory> using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::task; using namespace ::com::sun::star::uno; +using ::com::sun::star::frame::XTerminateListener; +using ::com::sun::star::frame::XDesktop; using ::com::sun::star::ucb::XSimpleFileAccess; using ::rtl::OUString; using ::std::vector; @@ -102,7 +108,8 @@ namespace public: OnLogRotateThread(Reference<XMultiServiceFactory> sf); virtual void SAL_CALL run(); - void disposing(); + OnLogRotateThread* disposing(); + private: Reference<XMultiServiceFactory> m_ServiceFactory; ::osl::Mutex m_ServiceFactoryMutex; @@ -135,11 +142,35 @@ namespace } } - void OnLogRotateThread::disposing() + OnLogRotateThread* OnLogRotateThread::disposing() { ::osl::Guard< ::osl::Mutex> service_factory_guard(m_ServiceFactoryMutex); m_ServiceFactory.clear(); + return this; } + + class OnLogRotateThreadWatcher : public ::cppu::WeakImplHelper1<XTerminateListener> + { + public: + OnLogRotateThreadWatcher(Reference<XMultiServiceFactory> sf) + : m_Thread(new OnLogRotateThread(sf)) + { + m_Thread->create(); + } + virtual ~OnLogRotateThreadWatcher() + { m_Thread->disposing()->terminate(); }; + + // XTerminateListener + virtual void SAL_CALL queryTermination(const EventObject&) throw(RuntimeException) + { }; + virtual void SAL_CALL notifyTermination(const EventObject&) throw(RuntimeException) + { m_Thread->disposing()->terminate(); }; + // XEventListener + virtual void SAL_CALL disposing(const EventObject&) throw(RuntimeException) + { m_Thread->disposing()->terminate(); }; + private: + ::std::auto_ptr<OnLogRotateThread> m_Thread; + }; } namespace oooimprovement @@ -163,9 +194,11 @@ namespace oooimprovement const Reference<XJobListener>& listener) throw(RuntimeException) { - OnLogRotateThread* thread = new OnLogRotateThread(m_ServiceFactory); - thread->create(); - + Reference<XDesktop> xDesktop( + m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.frame.Desktop")), + UNO_QUERY); + if(xDesktop.is()) + xDesktop->addTerminateListener(Reference<XTerminateListener>(new OnLogRotateThreadWatcher(m_ServiceFactory))); Any result; listener->jobFinished(Reference<XAsyncJob>(this), result); } @@ -190,7 +223,7 @@ namespace oooimprovement Sequence<OUString> SAL_CALL OnLogRotateJob::getSupportedServiceNames_static() { Sequence<OUString> aServiceNames(1); - aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.XAsyncJob"); + aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.AsyncJob"); return aServiceNames; } diff --git a/extensions/source/oooimprovement/oooimprovement.component b/extensions/source/oooimprovement/oooimprovement.component new file mode 100644 index 000000000..e133f932c --- /dev/null +++ b/extensions/source/oooimprovement/oooimprovement.component @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation + name="com.sun.star.comp.extensions.oooimprovement.CoreController"> + <service name="com.sun.star.oooimprovement.CoreController"/> + </implementation> + <implementation name="com.sun.star.comp.extensions.oooimprovement.InviteJob"/> + <implementation + name="com.sun.star.comp.extensions.oooimprovement.OnLogRotateJob"/> +</component> diff --git a/extensions/source/oooimprovement/oooimprovement_exports.cxx b/extensions/source/oooimprovement/oooimprovement_exports.cxx index e073088a5..13eb763e1 100644 --- a/extensions/source/oooimprovement/oooimprovement_exports.cxx +++ b/extensions/source/oooimprovement/oooimprovement_exports.cxx @@ -65,28 +65,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(const sal_Char** env_type_name, uno_Environment**) { *env_type_name = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - sal_Bool SAL_CALL component_writeInfo(void*, void* p_reg_key) - { - if (!p_reg_key) return sal_False; - try - { - Reference<XRegistryKey> reg_key(reinterpret_cast<XRegistryKey*>(p_reg_key), UNO_QUERY); - writeInfo(reg_key, - CoreController::getImplementationName_static(), - CoreController::getSupportedServiceNames_static()[0]); - writeInfo(reg_key, - OnLogRotateJob::getImplementationName_static(), - OnLogRotateJob::getSupportedServiceNames_static()[0]); - writeInfo(reg_key, - InviteJob::getImplementationName_static(), - InviteJob::getSupportedServiceNames_static()[0]); - return sal_True; - } - catch(const InvalidRegistryException&) - { OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); } - return sal_False; - } - void* SAL_CALL component_getFactory(const sal_Char* pImplName, void* pServiceManager, void*) { if ( !pServiceManager || !pImplName ) return 0; diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx index 3a4b8b78e..eabefd4c4 100644 --- a/extensions/source/plugin/base/service.cxx +++ b/extensions/source/plugin/base/service.cxx @@ -54,33 +54,6 @@ extern "C" { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pXUnoKey ) - { - if( pXUnoKey ) - { - try - { - Reference< ::com::sun::star::registry::XRegistryKey > xKey( reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pXUnoKey ) ); - - ::rtl::OUString aImplName = ::rtl::OUString::createFromAscii( "/" ); - aImplName += XPluginManager_Impl::getImplementationName_Static(); - aImplName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES/com.sun.star.plugin.PluginManager" ); - xKey->createKey( aImplName ); - - aImplName = ::rtl::OUString::createFromAscii( "/" ); - aImplName += PluginModel::getImplementationName_Static(); - aImplName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES/com.sun.star.plugin.PluginModel" ); - xKey->createKey( aImplName ); - - return sal_True; - } - catch( ::com::sun::star::registry::InvalidRegistryException& ) - { - } - } - return sal_False; - } - void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pXUnoSMgr, diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx index 800e06aa1..99f41aed3 100644 --- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx +++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx @@ -90,10 +90,10 @@ protected: int m_nSocket; std::vector<MediatorMessage*> m_aMessageQueue; - NAMESPACE_VOS(OMutex) m_aQueueMutex; - NAMESPACE_VOS(OMutex) m_aSendMutex; + vos::OMutex m_aQueueMutex; + vos::OMutex m_aSendMutex; // only one thread can send a message at any given time - NAMESPACE_VOS(OCondition) m_aNewMessageCdtn; + vos::OCondition m_aNewMessageCdtn; MediatorListener* m_pListener; // thread to fill the queue @@ -150,7 +150,7 @@ public: } }; -class MediatorListener : public NAMESPACE_VOS( OThread ) +class MediatorListener : public vos:: OThread { friend class Mediator; private: diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx index c347fed29..a91be657e 100644 --- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx +++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx @@ -166,7 +166,7 @@ public: class PluginConnector : public Mediator { protected: - NAMESPACE_VOS(OMutex) m_aUserEventMutex; + vos::OMutex m_aUserEventMutex; static std::vector<PluginConnector*> allConnectors; diff --git a/extensions/source/plugin/unx/mediator.cxx b/extensions/source/plugin/unx/mediator.cxx index 9ddc0d740..9344da93f 100644 --- a/extensions/source/plugin/unx/mediator.cxx +++ b/extensions/source/plugin/unx/mediator.cxx @@ -80,7 +80,7 @@ ULONG Mediator::SendMessage( ULONG nBytes, const char* pBytes, ULONG nMessageID if( ! m_pListener ) return 0; - NAMESPACE_VOS(OGuard) aGuard( m_aSendMutex ); + vos::OGuard aGuard( m_aSendMutex ); if( ! nMessageID ) nMessageID = m_nCurrentID; @@ -132,7 +132,7 @@ MediatorMessage* Mediator::WaitForAnswer( ULONG nMessageID ) while( m_pListener ) { { - NAMESPACE_VOS(OGuard) aGuard( m_aQueueMutex ); + vos::OGuard aGuard( m_aQueueMutex ); for( size_t i = 0; i < m_aMessageQueue.size(); i++ ) { MediatorMessage* pMessage = m_aMessageQueue[ i ]; @@ -157,7 +157,7 @@ MediatorMessage* Mediator::GetNextMessage( BOOL bWait ) { // guard must be after WaitForMessage, else the listener // cannot insert a new one -> deadlock - NAMESPACE_VOS(OGuard) aGuard( m_aQueueMutex ); + vos::OGuard aGuard( m_aQueueMutex ); for( size_t i = 0; i < m_aMessageQueue.size(); i++ ) { MediatorMessage* pMessage = m_aMessageQueue[ i ]; @@ -207,7 +207,7 @@ void MediatorListener::run() { ::vos::OGuard aMyGuard( m_aMutex ); { - NAMESPACE_VOS(OGuard) + vos::OGuard aGuard( m_pMediator->m_aQueueMutex ); MediatorMessage* pMessage = new MediatorMessage( nHeader[ 0 ], nHeader[ 1 ], pBuffer ); diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx index 4ba43dd61..87f93d565 100644 --- a/extensions/source/plugin/unx/npnapi.cxx +++ b/extensions/source/plugin/unx/npnapi.cxx @@ -1,10 +1,29 @@ /************************************************************************* - - Source Code Control System - Header - - $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/extensions/source/plugin/unx/npnapi.cxx,v 1.11 2008-01-14 14:53:25 ihi Exp $ - -*************************************************************************/ + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * 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 + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx index bfe9d4edc..99f9ce839 100644 --- a/extensions/source/plugin/unx/nppapi.cxx +++ b/extensions/source/plugin/unx/nppapi.cxx @@ -1,10 +1,29 @@ /************************************************************************* - - Source Code Control System - Header - - $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/extensions/source/plugin/unx/nppapi.cxx,v 1.7 2008-01-14 14:53:38 ihi Exp $ - -*************************************************************************/ + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * 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 + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" @@ -27,7 +46,7 @@ PluginConnector::PluginConnector( int nSocket ) : PluginConnector::~PluginConnector() { - NAMESPACE_VOS(OGuard) aGuard( m_aUserEventMutex ); + vos::OGuard aGuard( m_aUserEventMutex ); for( std::vector< PluginConnector* >::iterator it = allConnectors.begin(); it != allConnectors.end(); ++it ) { @@ -41,7 +60,7 @@ PluginConnector::~PluginConnector() IMPL_LINK( PluginConnector, NewMessageHdl, Mediator*, /*pMediator*/ ) { - NAMESPACE_VOS(OGuard) aGuard( m_aUserEventMutex ); + vos::OGuard aGuard( m_aUserEventMutex ); bool bFound = false; for( std::vector< PluginConnector* >::iterator it = allConnectors.begin(); it != allConnectors.end() && bFound == false; ++it ) @@ -68,7 +87,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ ) return 0; /* { - NAMESPACE_VOS(OGuard) aGuard( m_aUserEventMutex ); + vos::OGuard aGuard( m_aUserEventMutex ); m_aUserEventIDs.pop_front(); } */ diff --git a/extensions/source/plugin/unx/plugcon.cxx b/extensions/source/plugin/unx/plugcon.cxx index d2cadb707..69ed867be 100644 --- a/extensions/source/plugin/unx/plugcon.cxx +++ b/extensions/source/plugin/unx/plugcon.cxx @@ -172,7 +172,7 @@ MediatorMessage* PluginConnector::WaitForAnswer( ULONG nMessageID ) while( m_pListener ) { { - NAMESPACE_VOS(OGuard) aGuard( m_aQueueMutex ); + vos::OGuard aGuard( m_aQueueMutex ); for( size_t i = 0; i < m_aMessageQueue.size(); i++ ) { MediatorMessage* pMessage = m_aMessageQueue[ i ]; diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk index 7a8c46c01..765941689 100644 --- a/extensions/source/plugin/util/makefile.mk +++ b/extensions/source/plugin/util/makefile.mk @@ -107,3 +107,11 @@ SHL1STDLIBS+=$(SHL1OWNLIBS) + +ALLTAR : $(MISC)/pl.component + +$(MISC)/pl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + pl.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt pl.component diff --git a/extensions/source/plugin/util/pl.component b/extensions/source/plugin/util/pl.component new file mode 100644 index 000000000..4a9d98f7d --- /dev/null +++ b/extensions/source/plugin/util/pl.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.extensions.PluginManager"> + <service name="com.sun.star.plugin.PluginManager"/> + </implementation> + <implementation name="com.sun.star.extensions.PluginModel"> + <service name="com.sun.star.plugin.PluginModel"/> + </implementation> +</component> diff --git a/extensions/source/preload/makefile.mk b/extensions/source/preload/makefile.mk index fb11a2bfd..8bd622661 100644 --- a/extensions/source/preload/makefile.mk +++ b/extensions/source/preload/makefile.mk @@ -83,3 +83,11 @@ DEF1NAME= $(SHL1TARGET) .INCLUDE : target.mk + +ALLTAR : $(MISC)/preload.component + +$(MISC)/preload.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + preload.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt preload.component diff --git a/extensions/source/preload/preload.component b/extensions/source/preload/preload.component new file mode 100644 index 000000000..56a8a0d7a --- /dev/null +++ b/extensions/source/preload/preload.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="org.openoffice.comp.preload.OEMPreloadWizard"> + <service name="org.openoffice.comp.preload.OEMPreloadWizard"/> + </implementation> +</component> diff --git a/extensions/source/preload/preload.src b/extensions/source/preload/preload.src index 301e489cd..17ccbf8b4 100644 --- a/extensions/source/preload/preload.src +++ b/extensions/source/preload/preload.src @@ -31,6 +31,7 @@ ModalDialog RID_DLG_OEMWIZARD { + HelpID = "extensions:ModalDialog:RID_DLG_OEMWIZARD"; Text = "%PRODUCTNAME %PRODUCTVERSION"; OutputSize = TRUE ; @@ -40,11 +41,13 @@ ModalDialog RID_DLG_OEMWIZARD Hide = TRUE; PushButton PB_PREV { + HelpID = "extensions:PushButton:RID_DLG_OEMWIZARD:PB_PREV"; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "<< Back" ; }; PushButton PB_NEXT { + HelpID = "extensions:PushButton:RID_DLG_OEMWIZARD:PB_NEXT"; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Next >>" ; }; @@ -72,6 +75,7 @@ ModalDialog RID_DLG_OEMWIZARD }; TabPage RID_TP_WELCOME { + HelpID = "extensions:TabPage:RID_TP_WELCOME"; // HelpId = ; OutputSize = TRUE ; SVLook = TRUE ; @@ -130,6 +134,7 @@ TabPage RID_TP_WELCOME TabPage RID_TP_LICENSE { + HelpID = "extensions:TabPage:RID_TP_LICENSE"; OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; @@ -138,6 +143,7 @@ TabPage RID_TP_LICENSE MultiLineEdit ML_LICENSE { + HelpID = "extensions:MultiLineEdit:RID_TP_LICENSE:ML_LICENSE"; PosSize = MAP_APPFONT ( LICENSE_COL_1 , LICENSE_ROW_1 , LICENSE_WIDTH , LICENCE_HEIGHT ) ; Border = TRUE ; VScroll = TRUE ; @@ -185,6 +191,7 @@ TabPage RID_TP_LICENSE PushButton PB_PAGEDOWN { + HelpID = "extensions:PushButton:RID_TP_LICENSE:PB_PAGEDOWN"; TabStop = TRUE ; Pos = MAP_APPFONT ( LICENSE_COL_4 , LICENSE_ROW_3 ) ; Size = MAP_APPFONT ( PD_WIDTH , PB_HEIGHT ) ; @@ -209,6 +216,7 @@ TabPage RID_TP_LICENSE CheckBox CB_ACCEPT { + HelpID = "extensions:CheckBox:RID_TP_LICENSE:CB_ACCEPT"; TabStop = TRUE ; Pos = MAP_APPFONT ( LICENSE_COL_3, LICENSE_ROW_5 ) ; Size = MAP_APPFONT ( COL3_WIDTH, FT_HEIGHT ) ; diff --git a/extensions/source/preload/services.cxx b/extensions/source/preload/services.cxx index b5ef9ceeb..d35c3d1ed 100644 --- a/extensions/source/preload/services.cxx +++ b/extensions/source/preload/services.cxx @@ -66,27 +66,6 @@ component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* pServiceManager, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - return ::preload::OModule::writeComponentInfos( - static_cast<XMultiServiceFactory*>(pServiceManager), - static_cast<XRegistryKey*>(pRegistryKey)); - } - catch (InvalidRegistryException& ) - { - OSL_ASSERT("preload::component_writeInfo: could not create a registry key (InvalidRegistryException) !"); - } - - return sal_False; -} - -//--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index bbff22638..07516e1bd 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -105,20 +105,20 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserLine::SetComponentHelpIds( const SmartId& _rHelpId, sal_uInt32 _bPrimaryButtonId, sal_uInt32 _nSecondaryButtonId ) + void OBrowserLine::SetComponentHelpIds( const rtl::OString& _rHelpId, const rtl::OString& _sPrimaryButtonId, const rtl::OString& _sSecondaryButtonId ) { if ( m_pControlWindow ) - m_pControlWindow->SetSmartHelpId( _rHelpId ); + m_pControlWindow->SetHelpId( _rHelpId ); if ( m_pBrowseButton ) { - m_pBrowseButton->SetSmartHelpId( _rHelpId ); - m_pBrowseButton->SetUniqueId( _bPrimaryButtonId ); + m_pBrowseButton->SetHelpId( _rHelpId ); + m_pBrowseButton->SetUniqueId( _sPrimaryButtonId ); if ( m_pAdditionalBrowseButton ) { - m_pAdditionalBrowseButton->SetSmartHelpId( _rHelpId ); - m_pAdditionalBrowseButton->SetUniqueId( _nSecondaryButtonId ); + m_pAdditionalBrowseButton->SetHelpId( _rHelpId ); + m_pAdditionalBrowseButton->SetUniqueId( _sSecondaryButtonId ); } } } diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index bd2aa9a5e..5dd27349c 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -92,7 +92,7 @@ namespace pcr const ::rtl::OUString& GetEntryName() const { return m_sEntryName; } - void SetComponentHelpIds( const SmartId& _rHelpId, sal_uInt32 _bPrimaryButtonId, sal_uInt32 _nSecondaryButtonId ); + void SetComponentHelpIds( const rtl::OString& _rHelpId, const rtl::OString& _sPrimaryButtonId, const rtl::OString& _sSecondaryButtonId ); void SetTitle(const String& rString ); void FullFillTitleString(); diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index bee29a21e..c64375903 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -1196,8 +1196,8 @@ namespace pcr m_aOutOfDateLines.insert( nPos ); rLine.pLine->SetComponentHelpIds( HelpIdUrl::getHelpId( _rPropertyData.HelpURL ), - _rPropertyData.PrimaryButtonId, - _rPropertyData.SecondaryButtonId + rtl::OUStringToOString( _rPropertyData.PrimaryButtonId, RTL_TEXTENCODING_UTF8 ), + rtl::OUStringToOString( _rPropertyData.SecondaryButtonId, RTL_TEXTENCODING_UTF8 ) ); if ( _rPropertyData.bReadOnly ) diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 2fab07761..1971138df 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -187,7 +187,7 @@ namespace pcr { const sal_Char* programmaticName; USHORT uiNameResId; - sal_uInt32 helpId; + const sal_Char* helpId; } aCategories[] = { { "General", RID_STR_PROPPAGE_DEFAULT, HID_FM_PROPDLG_TAB_GENERAL }, { "Data", RID_STR_PROPPAGE_DATA, HID_FM_PROPDLG_TAB_DATA }, diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index 588480a7b..f88aa3928 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -454,12 +454,12 @@ namespace pcr } break; - case PROPERTY_ID_BIND_EXPRESSION: aDescriptor.PrimaryButtonId = UID_PROP_DLG_BIND_EXPRESSION; break; - case PROPERTY_ID_XSD_REQUIRED: aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_REQUIRED; break; - case PROPERTY_ID_XSD_RELEVANT: aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_RELEVANT; break; - case PROPERTY_ID_XSD_READONLY: aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_READONLY; break; - case PROPERTY_ID_XSD_CONSTRAINT: aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_CONSTRAINT; break; - case PROPERTY_ID_XSD_CALCULATION: aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_CALCULATION; break; + case PROPERTY_ID_BIND_EXPRESSION: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BIND_EXPRESSION); break; + case PROPERTY_ID_XSD_REQUIRED: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_REQUIRED); break; + case PROPERTY_ID_XSD_RELEVANT: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_RELEVANT); break; + case PROPERTY_ID_XSD_READONLY: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_READONLY); break; + case PROPERTY_ID_XSD_CONSTRAINT: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_CONSTRAINT); break; + case PROPERTY_ID_XSD_CALCULATION: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_CALCULATION); break; default: DBG_ERROR( "EFormsPropertyHandler::describePropertyLine: cannot handle this property!" ); diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 253315f4e..5235ba1d2 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -151,11 +151,11 @@ namespace pcr //= EventDescription //==================================================================== EventDescription::EventDescription( EventId _nId, const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName, - const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, sal_Int32 _nHelpId, sal_Int32 _nUniqueBrowseId ) + const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, const rtl::OString& _sHelpId, const rtl::OString& _sUniqueBrowseId ) :sDisplayName( String( PcrRes( _nDisplayNameResId ) ) ) ,sListenerMethodName( ::rtl::OUString::createFromAscii( _pListenerMethodAsciiName ) ) - ,nHelpId( _nHelpId ) - ,nUniqueBrowseId( _nUniqueBrowseId ) + ,sHelpId( _sHelpId ) + ,sUniqueBrowseId( _sUniqueBrowseId ) ,nId( _nId ) { ::rtl::OUStringBuffer aQualifiedListenerClass; @@ -879,8 +879,8 @@ namespace pcr const EventDescription& rEvent = impl_getEventForName_throw( _rPropertyName ); aDescriptor.DisplayName = rEvent.sDisplayName; - aDescriptor.HelpURL = HelpIdUrl::getHelpURL( rEvent.nHelpId ); - aDescriptor.PrimaryButtonId = rEvent.nUniqueBrowseId; + aDescriptor.HelpURL = HelpIdUrl::getHelpURL( rEvent.sHelpId ); + aDescriptor.PrimaryButtonId = rtl::OStringToOUString(rEvent.sUniqueBrowseId, RTL_TEXTENCODING_UTF8); aDescriptor.HasPrimaryButton = sal_True; aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Events" ) ); return aDescriptor; @@ -1265,12 +1265,12 @@ namespace pcr switch ( m_nGridColumnType ) { case FormComponentType::COMBOBOX: - if ( UID_BRWEVT_ACTIONPERFORMED == _rEvent.nUniqueBrowseId ) + if ( UID_BRWEVT_ACTIONPERFORMED == _rEvent.sUniqueBrowseId ) return false; break; case FormComponentType::LISTBOX: - if ( ( UID_BRWEVT_CHANGED == _rEvent.nUniqueBrowseId ) - || ( UID_BRWEVT_ACTIONPERFORMED == _rEvent.nUniqueBrowseId ) + if ( ( UID_BRWEVT_CHANGED == _rEvent.sUniqueBrowseId ) + || ( UID_BRWEVT_ACTIONPERFORMED == _rEvent.sUniqueBrowseId ) ) return false; break; diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index 437ee464b..f1561d242 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -57,14 +57,12 @@ namespace pcr ::rtl::OUString sDisplayName; ::rtl::OUString sListenerClassName; ::rtl::OUString sListenerMethodName; - sal_Int32 nHelpId; - sal_Int32 nUniqueBrowseId; + ::rtl::OString sHelpId; + ::rtl::OString sUniqueBrowseId; EventId nId; - EventDescription() - :nHelpId( 0 ) - ,nUniqueBrowseId( 0 ) - ,nId( 0 ) + EventDescription() + :nId( 0 ) { } @@ -74,8 +72,8 @@ namespace pcr const sal_Char* _pListenerClassAsciiName, const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, - sal_Int32 _nHelpId, - sal_Int32 _nUniqueBrowseId ); + const rtl::OString& _sHelpId, + const rtl::OString& _sUniqueBrowseId ); }; typedef ::std::hash_map< ::rtl::OUString, EventDescription, ::rtl::OUStringHash > EventMap; diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 97d72dad1..4d6812496 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -1023,39 +1023,39 @@ namespace pcr { case PROPERTY_ID_DEFAULT_SELECT_SEQ: case PROPERTY_ID_SELECTEDITEMS: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_SELECTION; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SELECTION); break; case PROPERTY_ID_FILTER: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_FILTER; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FILTER); break; case PROPERTY_ID_SORT: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_ORDER; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_ORDER); break; case PROPERTY_ID_MASTERFIELDS: case PROPERTY_ID_DETAILFIELDS: nControlType = PropertyControlType::StringListField; - aDescriptor.PrimaryButtonId = UID_PROP_DLG_FORMLINKFIELDS; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FORMLINKFIELDS); break; case PROPERTY_ID_COMMAND: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_SQLCOMMAND; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); break; case PROPERTY_ID_TABINDEX: { Reference< XControlContainer > xControlContext( impl_getContextControlContainer_nothrow() ); if ( xControlContext.is() ) - aDescriptor.PrimaryButtonId = UID_PROP_DLG_TABINDEX; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_TABINDEX); nControlType = PropertyControlType::NumericField; }; break; case PROPERTY_ID_FONT: bReadOnly = sal_True; - aDescriptor.PrimaryButtonId = UID_PROP_DLG_FONT_TYPE; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FONT_TYPE); break; case PROPERTY_ID_TARGET_URL: @@ -1063,8 +1063,8 @@ namespace pcr { aDescriptor.Control = new OFileUrlControl( impl_getDefaultDialogParent_nothrow(), WB_TABSTOP | WB_BORDER ); - aDescriptor.PrimaryButtonId = ( PROPERTY_ID_TARGET_URL == nPropId ) - ? UID_PROP_DLG_ATTR_TARGET_URL : UID_PROP_DLG_IMAGE_URL; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(( PROPERTY_ID_TARGET_URL == nPropId ) + ? UID_PROP_DLG_ATTR_TARGET_URL : UID_PROP_DLG_IMAGE_URL); } break; @@ -1081,13 +1081,13 @@ namespace pcr switch( nPropId ) { case PROPERTY_ID_BACKGROUNDCOLOR: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_BACKGROUNDCOLOR; break; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BACKGROUNDCOLOR); break; case PROPERTY_ID_FILLCOLOR: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_FILLCOLOR; break; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FILLCOLOR); break; case PROPERTY_ID_SYMBOLCOLOR: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_SYMBOLCOLOR; break; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SYMBOLCOLOR); break; case PROPERTY_ID_BORDERCOLOR: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_BORDERCOLOR; break; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BORDERCOLOR); break; } break; @@ -1111,7 +1111,7 @@ namespace pcr case PROPERTY_ID_CONTROLLABEL: bReadOnly = sal_True; - aDescriptor.PrimaryButtonId = UID_PROP_DLG_CONTROLLABEL; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_CONTROLLABEL); break; case PROPERTY_ID_FORMATKEY: @@ -1141,7 +1141,7 @@ namespace pcr aDescriptor.Control = pControl; pControl->SetFormatSupplier( pSupplier ); - aDescriptor.PrimaryButtonId = UID_PROP_DLG_NUMBER_FORMAT; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_NUMBER_FORMAT); } else { @@ -1366,7 +1366,7 @@ namespace pcr // DataSource case PROPERTY_ID_DATASOURCE: { - aDescriptor.PrimaryButtonId = UID_PROP_DLG_ATTR_DATASOURCE; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_ATTR_DATASOURCE); ::std::vector< ::rtl::OUString > aListEntries; @@ -1416,7 +1416,7 @@ namespace pcr } } - if ( aDescriptor.PrimaryButtonId ) + if ( aDescriptor.PrimaryButtonId.getLength() ) aDescriptor.HasPrimaryButton = sal_True; if ( aDescriptor.SecondaryButtonId ) aDescriptor.HasSecondaryButton = sal_True; @@ -2471,7 +2471,7 @@ namespace pcr _out_rProperty.DisplayName = m_pInfoService->getPropertyTranslation( PROPERTY_ID_COMMAND ); _out_rProperty.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( PROPERTY_ID_COMMAND ) ); - _out_rProperty.PrimaryButtonId = UID_PROP_DLG_SQLCOMMAND; + _out_rProperty.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); //////////////////////////////////////////////////////////// sal_Int32 nCommandType = CommandType::COMMAND; diff --git a/extensions/source/propctrlr/formlinkdialog.src b/extensions/source/propctrlr/formlinkdialog.src index ca936a58d..db0ef08d6 100644 --- a/extensions/source/propctrlr/formlinkdialog.src +++ b/extensions/source/propctrlr/formlinkdialog.src @@ -35,6 +35,7 @@ ModalDialog RID_DLG_FORMLINKS { + HelpID = "extensions:ModalDialog:RID_DLG_FORMLINKS"; OutputSize = TRUE ; Moveable = TRUE ; Closeable = TRUE ; @@ -133,6 +134,7 @@ ModalDialog RID_DLG_FORMLINKS PushButton PB_SUGGEST { + HelpID = "extensions:PushButton:RID_DLG_FORMLINKS:PB_SUGGEST"; Pos = MAP_APPFONT( 199, 90 ); Size = MAP_APPFONT( 50, 14 ); TabStop = TRUE; diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index f6ab37e3f..31a1cda41 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -57,7 +57,7 @@ namespace pcr { String sName; String sTranslation; - sal_uInt32 nHelpId; + rtl::OString sHelpId; sal_Int32 nId; sal_uInt16 nPos; sal_uInt32 nUIFlags; @@ -67,16 +67,16 @@ namespace pcr sal_Int32 _nId, const String& aTranslation, sal_uInt16 nPosId, - sal_uInt32 nHelpId, + const rtl::OString&, sal_uInt32 _nUIFlags); }; //------------------------------------------------------------------------ OPropertyInfoImpl::OPropertyInfoImpl(const ::rtl::OUString& _rName, sal_Int32 _nId, - const String& aString, sal_uInt16 nP, sal_uInt32 nHid, sal_uInt32 _nUIFlags) + const String& aString, sal_uInt16 nP, const rtl::OString& sHid, sal_uInt32 _nUIFlags) :sName(_rName) ,sTranslation(aString) - ,nHelpId(nHid) + ,sHelpId(sHid) ,nId(_nId) ,nPos(nP) ,nUIFlags(_nUIFlags) @@ -399,10 +399,10 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Int32 OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const + rtl::OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); - return (pInfo) ? pInfo->nHelpId : 0; + return (pInfo) ? pInfo->sHelpId : rtl::OString(); } //------------------------------------------------------------------------ @@ -560,7 +560,7 @@ namespace pcr // intialisierung if(!s_pPropertyInfos) getPropertyInfo(); - OPropertyInfoImpl aSearch(_rName, 0L, String(), 0, 0, 0); + OPropertyInfoImpl aSearch(_rName, 0L, String(), 0, "", 0); const OPropertyInfoImpl* pInfo = ::std::lower_bound( s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch, PropertyInfoLessByName() ); diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx index e5413f297..a7ff622d1 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.hxx @@ -59,7 +59,7 @@ namespace pcr // IPropertyInfoService virtual sal_Int32 getPropertyId(const String& _rName) const; virtual String getPropertyTranslation(sal_Int32 _nId) const; - virtual sal_Int32 getPropertyHelpId(sal_Int32 _nId) const; + virtual rtl::OString getPropertyHelpId(sal_Int32 _nId) const; virtual sal_Int16 getPropertyPos(sal_Int32 _nId) const; virtual sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const; virtual ::std::vector< ::rtl::OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const; diff --git a/extensions/source/propctrlr/listselectiondlg.src b/extensions/source/propctrlr/listselectiondlg.src index 7b148e8a9..c2cae7ab0 100644 --- a/extensions/source/propctrlr/listselectiondlg.src +++ b/extensions/source/propctrlr/listselectiondlg.src @@ -35,6 +35,7 @@ ModalDialog RID_DLG_SELECTION { + HelpID = "extensions:ModalDialog:RID_DLG_SELECTION"; OutputSize = TRUE ; Moveable = TRUE ; Closeable = TRUE ; @@ -49,6 +50,7 @@ ModalDialog RID_DLG_SELECTION ListBox LB_ENTRIES { + HelpID = "extensions:ListBox:RID_DLG_SELECTION:LB_ENTRIES"; Pos = MAP_APPFONT( 6, 17 ); Size = MAP_APPFONT( 85, 97 ); diff --git a/extensions/source/propctrlr/makefile.mk b/extensions/source/propctrlr/makefile.mk index c69f47bce..ebb629ae3 100644 --- a/extensions/source/propctrlr/makefile.mk +++ b/extensions/source/propctrlr/makefile.mk @@ -144,3 +144,11 @@ DEF1NAME= $(SHL1TARGET) .INCLUDE : target.mk + +ALLTAR : $(MISC)/pcr.component + +$(MISC)/pcr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + pcr.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt pcr.component diff --git a/extensions/source/propctrlr/newdatatype.src b/extensions/source/propctrlr/newdatatype.src index 6cf39a322..90be27153 100644 --- a/extensions/source/propctrlr/newdatatype.src +++ b/extensions/source/propctrlr/newdatatype.src @@ -39,6 +39,7 @@ ModalDialog RID_DLG_NEW_DATA_TYPE { + HelpID = "extensions:ModalDialog:RID_DLG_NEW_DATA_TYPE"; OutputSize = TRUE ; Moveable = TRUE ; Closeable = TRUE ; @@ -57,6 +58,7 @@ ModalDialog RID_DLG_NEW_DATA_TYPE Edit ED_NAME { + HelpID = "extensions:Edit:RID_DLG_NEW_DATA_TYPE:ED_NAME"; Pos = MAP_APPFONT( 6, 17 ); Size = MAP_APPFONT( DIALOG_WIDTH - 2 * 6, 12 ); Border = TRUE; diff --git a/extensions/source/propctrlr/pcr.component b/extensions/source/propctrlr/pcr.component new file mode 100644 index 000000000..2b606cc01 --- /dev/null +++ b/extensions/source/propctrlr/pcr.component @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="StringRepresentation"> + <service name="com.sun.star.inspection.StringRepresentation"/> + </implementation> + <implementation name="com.sun.star.comp.extensions.ButtonNavigationHandler"> + <service name="com.sun.star.form.inspection.ButtonNavigationHandler"/> + </implementation> + <implementation name="com.sun.star.comp.extensions.CellBindingPropertyHandler"> + <service name="com.sun.star.form.inspection.CellBindingPropertyHandler"/> + </implementation> + <implementation name="com.sun.star.comp.extensions.EFormsPropertyHandler"> + <service name="com.sun.star.form.inspection.XMLFormsPropertyHandler"/> + </implementation> + <implementation name="com.sun.star.comp.extensions.EditPropertyHandler"> + <service name="com.sun.star.form.inspection.EditPropertyHandler"/> + </implementation> + <implementation name="com.sun.star.comp.extensions.EventHandler"> + <service name="com.sun.star.form.inspection.EventHandler"/> + </implementation> + <implementation name="com.sun.star.comp.extensions.FormComponentPropertyHandler"> + <service name="com.sun.star.form.inspection.FormComponentPropertyHandler"/> + </implementation> + <implementation name="com.sun.star.comp.extensions.FormGeometryHandler"> + <service name="com.sun.star.form.inspection.FormGeometryHandler"/> + </implementation> + <implementation name="com.sun.star.comp.extensions.GenericPropertyHandler"> + <service name="com.sun.star.inspection.GenericPropertyHandler"/> + </implementation> + <implementation name="com.sun.star.comp.extensions.SubmissionPropertyHandler"> + <service name="com.sun.star.form.inspection.SubmissionPropertyHandler"/> + </implementation> + <implementation name="com.sun.star.comp.extensions.XSDValidationPropertyHandler"> + <service name="com.sun.star.form.inspection.XSDValidationPropertyHandler"/> + </implementation> + <implementation name="org.openoffice.comp.extensions.DefaultFormComponentInspectorModel"> + <service name="com.sun.star.form.inspection.DefaultFormComponentInspectorModel"/> + </implementation> + <implementation name="org.openoffice.comp.extensions.DefaultHelpProvider"> + <service name="com.sun.star.inspection.DefaultHelpProvider"/> + </implementation> + <implementation name="org.openoffice.comp.extensions.DialogController"> + <service name="com.sun.star.awt.PropertyBrowserController"/> + </implementation> + <implementation name="org.openoffice.comp.extensions.FormController"> + <service name="com.sun.star.form.PropertyBrowserController"/> + </implementation> + <implementation name="org.openoffice.comp.extensions.ObjectInspector"> + <service name="com.sun.star.inspection.ObjectInspector"/> + </implementation> + <implementation name="org.openoffice.comp.extensions.ObjectInspectorModel"> + <service name="com.sun.star.inspection.ObjectInspectorModel"/> + </implementation> + <implementation name="org.openoffice.comp.form.ui.MasterDetailLinkDialog"> + <service name="com.sun.star.form.MasterDetailLinkDialog"/> + </implementation> + <implementation name="org.openoffice.comp.form.ui.OControlFontDialog"> + <service name="com.sun.star.form.ControlFontDialog"/> + </implementation> + <implementation name="org.openoffice.comp.form.ui.OTabOrderDialog"> + <service name="com.sun.star.form.ui.TabOrderDialog"/> + </implementation> +</component> diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index 8949e9b40..5d1ac809c 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -39,6 +39,7 @@ #include <com/sun/star/util/MeasureUnit.hpp> /** === end UNO includes === **/ #include <rtl/ustrbuf.hxx> +#include <tools/urlobj.hxx> //............................................................................ namespace pcr @@ -51,20 +52,24 @@ namespace pcr //= HelpIdUrl //======================================================================== //------------------------------------------------------------------------ - SmartId HelpIdUrl::getHelpId( const ::rtl::OUString& _rHelpURL ) + rtl::OString HelpIdUrl::getHelpId( const ::rtl::OUString& _rHelpURL ) { - SmartId aSmartHelpId( _rHelpURL ); - if ( 0 == _rHelpURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "HID:" ) ) ) - aSmartHelpId = SmartId( _rHelpURL.copy( sizeof( "HID:" ) - 1 ).toInt32() ); - return aSmartHelpId; + INetURLObject aHID( _rHelpURL ); + if ( aHID.GetProtocol() == INET_PROT_HID ) + return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); + else + return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------ - ::rtl::OUString HelpIdUrl::getHelpURL( sal_uInt32 _nHelpId ) + ::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId ) { ::rtl::OUStringBuffer aBuffer; - aBuffer.appendAscii( "HID:" ); - aBuffer.append( (sal_Int32)_nHelpId ); + ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 ); + INetURLObject aHID( aTmp ); + if ( aHID.GetProtocol() == INET_PROT_NOT_VALID ) + aBuffer.appendAscii( INET_HID_SCHEME ); + aBuffer.append( aTmp.getStr() ); return aBuffer.makeStringAndClear(); } //............................................................................ diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index d8699e6f4..790bf0e02 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.hxx @@ -37,7 +37,6 @@ #include <com/sun/star/beans/PropertyChangeEvent.hpp> /** === end UNO includes === **/ -#include <vcl/smartid.hxx> #include <tools/string.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/listenernotification.hxx> @@ -78,8 +77,8 @@ namespace pcr class HelpIdUrl { public: - static SmartId getHelpId( const ::rtl::OUString& _rHelpURL ); - static ::rtl::OUString getHelpURL( sal_uInt32 _nHelpId ); + static rtl::OString getHelpId( const ::rtl::OUString& _rHelpURL ); + static ::rtl::OUString getHelpURL( const rtl::OString& ); }; //==================================================================== diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx index 51d6cc9b8..6a34e9567 100644 --- a/extensions/source/propctrlr/pcrservices.cxx +++ b/extensions/source/propctrlr/pcrservices.cxx @@ -104,27 +104,6 @@ component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* pServiceManager, - void* pRegistryKey - ) -{ - if (pRegistryKey) - try - { - return ::pcr::PcrModule::getInstance().writeComponentInfos( - static_cast<XMultiServiceFactory*>(pServiceManager), - static_cast<XRegistryKey*>(pRegistryKey)); - } - catch (InvalidRegistryException& ) - { - OSL_ASSERT("pcr::component_writeInfo: could not create a registry key (InvalidRegistryException) !"); - } - - return sal_False; -} - -//--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 26f0da8df..4b12280f1 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -1273,7 +1273,7 @@ namespace pcr // this category does not yet exist. This is allowed, as an inspector model might be lazy, and not provide // any category information of its own. In this case, we have a fallback ... m_aPageIds[ aDescriptor.Category ] = - getPropertyBox().AppendPage( aDescriptor.Category, SmartId() ); + getPropertyBox().AppendPage( aDescriptor.Category, rtl::OString() ); nTargetPageId = impl_getPageIdForCategory_nothrow( aDescriptor.Category ); } diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 6a47ab17a..6b815fbaa 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -220,7 +220,7 @@ namespace pcr } //------------------------------------------------------------------ - sal_uInt16 OPropertyEditor::AppendPage( const String & _rText, const SmartId& _rHelpId ) + sal_uInt16 OPropertyEditor::AppendPage( const String & _rText, const rtl::OString& _rHelpId ) { // obtain a new id sal_uInt16 nId = m_nNextId++; @@ -236,7 +236,7 @@ namespace pcr pPage->getListBox().SetObserver(m_pObserver); pPage->getListBox().EnableHelpSection( m_bHasHelpSection ); pPage->getListBox().SetHelpLineLimites( m_nMinHelpLines, m_nMaxHelpLines ); - pPage->SetSmartHelpId( _rHelpId ); + pPage->SetHelpId( _rHelpId ); // immediately activate the page m_aTabControl.SetTabPage(nId, pPage); @@ -246,10 +246,10 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::SetHelpId( sal_uInt32 nHelpId ) + void OPropertyEditor::SetHelpId( const rtl::OString& rHelpId ) { - Control::SetHelpId(0); - m_aTabControl.SetHelpId(nHelpId); + Control::SetHelpId(""); + m_aTabControl.SetHelpId(rHelpId); } //------------------------------------------------------------------ diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 5898b7053..a9a999be0 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -97,8 +97,8 @@ namespace pcr void SetHelpText( const ::rtl::OUString& _rHelpText ); void SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines ); - void SetHelpId( sal_uInt32 nHelpId ); - sal_uInt16 AppendPage( const String& r, const SmartId& _rHelpId ); + void SetHelpId( const rtl::OString& sHelpId ); + sal_uInt16 AppendPage( const String& r, const rtl::OString& _rHelpId ); void SetPage( sal_uInt16 ); void RemovePage(sal_uInt16 nID); sal_uInt16 GetCurPage(); diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx index 7a2737a35..c2a6f8bbc 100644 --- a/extensions/source/propctrlr/propertyinfo.hxx +++ b/extensions/source/propctrlr/propertyinfo.hxx @@ -31,6 +31,7 @@ #include <sal/types.h> #include <tools/string.hxx> #include <rtl/ustring.hxx> +#include <rtl/string.hxx> #include <vector> //............................................................................ @@ -46,7 +47,7 @@ namespace pcr public: virtual sal_Int32 getPropertyId(const String& _rName) const = 0; virtual String getPropertyTranslation(sal_Int32 _nId) const = 0; - virtual sal_Int32 getPropertyHelpId(sal_Int32 _nId) const = 0; + virtual rtl::OString getPropertyHelpId(sal_Int32 _nId) const = 0; virtual sal_Int16 getPropertyPos(sal_Int32 _nId) const = 0; virtual sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const = 0; virtual ::std::vector< ::rtl::OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const = 0; diff --git a/extensions/source/propctrlr/selectlabeldialog.src b/extensions/source/propctrlr/selectlabeldialog.src index 93cf7d24e..ab961c456 100644 --- a/extensions/source/propctrlr/selectlabeldialog.src +++ b/extensions/source/propctrlr/selectlabeldialog.src @@ -31,6 +31,7 @@ ModalDialog RID_DLG_SELECTLABELCONTROL { + HelpID = "extensions:ModalDialog:RID_DLG_SELECTLABELCONTROL"; OutputSize = TRUE; Size = MAP_APPFONT( 200, 151 ); Moveable = TRUE; @@ -51,6 +52,7 @@ ModalDialog RID_DLG_SELECTLABELCONTROL }; CheckBox 1 { + HelpID = "extensions:CheckBox:RID_DLG_SELECTLABELCONTROL:1"; Pos = MAP_APPFONT( 6, 115 ); Size = MAP_APPFONT( 188, 8 ); Text [ en-US ] = "~No assignment"; diff --git a/extensions/source/propctrlr/taborder.src b/extensions/source/propctrlr/taborder.src index fe55988f3..1dfe0ee58 100644 --- a/extensions/source/propctrlr/taborder.src +++ b/extensions/source/propctrlr/taborder.src @@ -35,6 +35,7 @@ ModalDialog RID_DLG_TABORDER { + HelpID = "extensions:ModalDialog:RID_DLG_TABORDER"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 168 , 158 ) ; @@ -60,6 +61,7 @@ ModalDialog RID_DLG_TABORDER PushButton PB_MOVE_UP { + HelpID = "extensions:PushButton:RID_DLG_TABORDER:PB_MOVE_UP"; Pos = MAP_APPFONT ( 102 , 14 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Move Up" ; @@ -67,6 +69,7 @@ ModalDialog RID_DLG_TABORDER PushButton PB_MOVE_DOWN { + HelpID = "extensions:PushButton:RID_DLG_TABORDER:PB_MOVE_DOWN"; Pos = MAP_APPFONT ( 102 , 32 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Move Down" ; @@ -74,6 +77,7 @@ ModalDialog RID_DLG_TABORDER PushButton PB_AUTO_ORDER { + HelpID = "extensions:PushButton:RID_DLG_TABORDER:PB_AUTO_ORDER"; Pos = MAP_APPFONT ( 102 , 50 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Automatic Sort" ; diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index b81061222..32d410816 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -331,8 +331,8 @@ namespace pcr implGetAvailableDataTypeNames( aListEntries ); - aDescriptor.PrimaryButtonId = UID_PROP_ADD_DATA_TYPE; - aDescriptor.SecondaryButtonId = UID_PROP_REMOVE_DATA_TYPE; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_ADD_DATA_TYPE); + aDescriptor.SecondaryButtonId = rtl::OUString::createFromAscii(UID_PROP_REMOVE_DATA_TYPE);; aDescriptor.HasPrimaryButton = aDescriptor.HasSecondaryButton = sal_True; aDescriptor.PrimaryButtonImageURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/extensions/res/buttonplus.png" ) ); aDescriptor.SecondaryButtonImageURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/extensions/res/buttonminus.png" ) ); diff --git a/extensions/source/resource/exports.dxp b/extensions/source/resource/exports.dxp index 9e59e9403..f0e1c6993 100644 --- a/extensions/source/resource/exports.dxp +++ b/extensions/source/resource/exports.dxp @@ -1,3 +1,2 @@ -component_writeInfo component_getImplementationEnvironment component_getFactory diff --git a/extensions/source/resource/makefile.mk b/extensions/source/resource/makefile.mk index a89d690b7..adeec5fd0 100644 --- a/extensions/source/resource/makefile.mk +++ b/extensions/source/resource/makefile.mk @@ -74,3 +74,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : target.mk .INCLUDE : $(PRJ)$/util$/target.pmk + +ALLTAR : $(MISC)/res.component + +$(MISC)/res.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + res.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt res.component diff --git a/extensions/source/resource/res.component b/extensions/source/resource/res.component new file mode 100644 index 000000000..57f96609d --- /dev/null +++ b/extensions/source/resource/res.component @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.extensions.ResourceService"> + <service name="com.sun.star.resource.VclStringResourceLoader"/> + </implementation> + <implementation name="com.sun.star.comp.resource.OpenOfficeResourceLoader"> + <service name="com.sun.star.resource.OfficeResourceLoader"/> + <singleton name="com.sun.star.resource.OfficeResourceLoader"/> + </implementation> +</component> diff --git a/extensions/source/resource/res_services.cxx b/extensions/source/resource/res_services.cxx index 73a979c22..dea7cf675 100644 --- a/extensions/source/resource/res_services.cxx +++ b/extensions/source/resource/res_services.cxx @@ -29,12 +29,7 @@ #include "precompiled_extensions.hxx" #include "res_services.hxx" -/** === begin UNO includes === **/ -#include <com/sun/star/registry/XRegistryKey.hpp> -/** === end UNO includes === **/ - /** === begin UNO using === **/ -using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Exception; @@ -64,43 +59,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, XRegistryKey * pRegistryKey ) -{ - try - { - ::std::vector< ::res::ComponentInfo > aComponentInfos( ::res::getComponentInfos() ); - for ( ::std::vector< ::res::ComponentInfo >::const_iterator loop = aComponentInfos.begin(); - loop != aComponentInfos.end(); - ++loop - ) - { - Reference< XRegistryKey > xNewKey = - pRegistryKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) - + loop->sImplementationName + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ) ) ); - - for( sal_Int32 i = 0; i < loop->aSupportedServices.getLength(); ++i ) - xNewKey->createKey( loop->aSupportedServices.getConstArray()[i]); - - if ( loop->sSingletonName.getLength() ) - { - OSL_ENSURE( loop->aSupportedServices.getLength() == 1, "singletons must support exactly one service!" ); - xNewKey = pRegistryKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) - + loop->sImplementationName + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SINGLETONS/" ) ) - + loop->sSingletonName ); - xNewKey->setStringValue( loop->aSupportedServices[ 0 ] ); - } - } - - return sal_True; - } - catch (Exception &) - { - // not allowed to throw an exception over the c function. - //OSL_ENSURE( sal_False, "Exception cannot register component!" ); - return sal_False; - } -} - void * SAL_CALL component_getFactory( const sal_Char * pImplName, XMultiServiceFactory * /*pServiceManager*/, void * /*pRegistryKey*/ ) { diff --git a/extensions/source/scanner/exports.dxp b/extensions/source/scanner/exports.dxp index 9630d7e06..f0e1c6993 100644 --- a/extensions/source/scanner/exports.dxp +++ b/extensions/source/scanner/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/extensions/source/scanner/grid.src b/extensions/source/scanner/grid.src index ddf593ef7..e1734456f 100644 --- a/extensions/source/scanner/grid.src +++ b/extensions/source/scanner/grid.src @@ -28,6 +28,7 @@ ModalDialog GRID_DIALOG { + HelpID = "extensions:ModalDialog:GRID_DIALOG"; OutputSize = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 10 , 10 ) ; @@ -48,6 +49,7 @@ ModalDialog GRID_DIALOG }; ListBox GRID_DIALOG_TYPE_BOX { + HelpID = "extensions:ListBox:GRID_DIALOG:GRID_DIALOG_TYPE_BOX"; Border = TRUE ; Dropdown = TRUE ; Pos = MAP_APPFONT( 245, 45 ); @@ -55,6 +57,7 @@ ModalDialog GRID_DIALOG }; PushButton GRID_DIALOG_RESET_BTN { + HelpID = "extensions:PushButton:GRID_DIALOG:GRID_DIALOG_RESET_BTN"; Pos = MAP_APPFONT( 245, 65 ); Size = MAP_APPFONT( 50, 15 ); Text [ en-US ] = "Set"; diff --git a/extensions/source/scanner/makefile.mk b/extensions/source/scanner/makefile.mk index ff42864e0..519be1ff8 100644 --- a/extensions/source/scanner/makefile.mk +++ b/extensions/source/scanner/makefile.mk @@ -98,3 +98,11 @@ DEF1EXPORTFILE=exports.dxp .INCLUDE : target.mk + +ALLTAR : $(MISC)/scn.component + +$(MISC)/scn.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + scn.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt scn.component diff --git a/extensions/source/scanner/sanedlg.src b/extensions/source/scanner/sanedlg.src index 2b41785c8..20e825c07 100644 --- a/extensions/source/scanner/sanedlg.src +++ b/extensions/source/scanner/sanedlg.src @@ -27,6 +27,7 @@ #include <sanedlg.hrc> ModalDialog RID_SANE_DIALOG { + HelpID = "extensions:ModalDialog:RID_SANE_DIALOG"; OutputSize = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 10 , 10 ) ; @@ -46,12 +47,14 @@ ModalDialog RID_SANE_DIALOG }; PushButton RID_DEVICEINFO_BTN { + HelpID = "extensions:PushButton:RID_SANE_DIALOG:RID_DEVICEINFO_BTN"; Pos = MAP_APPFONT ( THIRD_COLUMN , 44 ) ; Size = MAP_APPFONT ( 55 , 22 ) ; Text [ en-US ] = "About\n Dev~ice" ; }; PushButton RID_PREVIEW_BTN { + HelpID = "extensions:PushButton:RID_SANE_DIALOG:RID_PREVIEW_BTN"; Pos = MAP_APPFONT ( THIRD_COLUMN , 71 ) ; Size = MAP_APPFONT ( 55 , 22 ) ; Text [ en-US ] = "Create\nPreview" ; @@ -76,6 +79,7 @@ ModalDialog RID_SANE_DIALOG }; MetricField RID_SCAN_LEFT_BOX { + HelpID = "extensions:MetricField:RID_SANE_DIALOG:RID_SCAN_LEFT_BOX"; Spin = TRUE ; Repeat = TRUE ; Border = TRUE ; @@ -90,6 +94,7 @@ ModalDialog RID_SANE_DIALOG }; MetricField RID_SCAN_TOP_BOX { + HelpID = "extensions:MetricField:RID_SANE_DIALOG:RID_SCAN_TOP_BOX"; Spin = TRUE ; Repeat = TRUE ; Border = TRUE ; @@ -104,6 +109,7 @@ ModalDialog RID_SANE_DIALOG }; MetricField RID_SCAN_RIGHT_BOX { + HelpID = "extensions:MetricField:RID_SANE_DIALOG:RID_SCAN_RIGHT_BOX"; Spin = TRUE ; Repeat = TRUE ; Border = TRUE ; @@ -118,6 +124,7 @@ ModalDialog RID_SANE_DIALOG }; MetricField RID_SCAN_BOTTOM_BOX { + HelpID = "extensions:MetricField:RID_SANE_DIALOG:RID_SCAN_BOTTOM_BOX"; Spin = TRUE ; Repeat = TRUE ; Border = TRUE ; @@ -132,6 +139,7 @@ ModalDialog RID_SANE_DIALOG }; ListBox RID_DEVICE_BOX { + HelpID = "extensions:ListBox:RID_SANE_DIALOG:RID_DEVICE_BOX"; Border = TRUE ; Dropdown = TRUE ; Sort = TRUE ; @@ -146,6 +154,7 @@ ModalDialog RID_SANE_DIALOG }; NumericBox RID_SCAN_RESOLUTION_BOX { + HelpID = "extensions:NumericBox:RID_SANE_DIALOG:RID_SCAN_RESOLUTION_BOX"; Dropdown = TRUE ; Pos = MAP_APPFONT ( SECOND_COLUMN + 70 , 23 ) ; Size = MAP_APPFONT ( 60 , 80 ) ; @@ -158,6 +167,7 @@ ModalDialog RID_SANE_DIALOG }; CheckBox RID_SCAN_ADVANCED_BOX { + HelpID = "extensions:CheckBox:RID_SANE_DIALOG:RID_SCAN_ADVANCED_BOX"; Check = FALSE ; Pos = MAP_APPFONT ( SECOND_COLUMN + 120 , 40 ) ; Size = MAP_APPFONT ( 8 , 8 ) ; @@ -188,17 +198,20 @@ ModalDialog RID_SANE_DIALOG }; CheckBox RID_SCAN_BOOL_OPTION_BOX { + HelpID = "extensions:CheckBox:RID_SANE_DIALOG:RID_SCAN_BOOL_OPTION_BOX"; Pos = MAP_APPFONT ( SECOND_COLUMN + 120 , 225 ) ; Size = MAP_APPFONT ( 8 , 8 ) ; }; Edit RID_SCAN_STRING_OPTION_EDT { + HelpID = "extensions:Edit:RID_SANE_DIALOG:RID_SCAN_STRING_OPTION_EDT"; Border = TRUE ; Pos = MAP_APPFONT ( SECOND_COLUMN , 234 ) ; Size = MAP_APPFONT ( 130 , 12 ) ; }; ListBox RID_SCAN_QUANTUM_RANGE_BOX { + HelpID = "extensions:ListBox:RID_SANE_DIALOG:RID_SCAN_QUANTUM_RANGE_BOX"; Border = TRUE ; Dropdown = TRUE ; Pos = MAP_APPFONT ( SECOND_COLUMN , 234 ) ; @@ -206,6 +219,7 @@ ModalDialog RID_SANE_DIALOG }; ListBox RID_SCAN_STRING_RANGE_BOX { + HelpID = "extensions:ListBox:RID_SANE_DIALOG:RID_SCAN_STRING_RANGE_BOX"; Border = TRUE ; Dropdown = TRUE ; Pos = MAP_APPFONT ( SECOND_COLUMN , 234 ) ; @@ -213,6 +227,7 @@ ModalDialog RID_SANE_DIALOG }; Edit RID_SCAN_NUMERIC_OPTION_EDT { + HelpID = "extensions:Edit:RID_SANE_DIALOG:RID_SCAN_NUMERIC_OPTION_EDT"; Border = TRUE ; Pos = MAP_APPFONT ( SECOND_COLUMN , 234 ) ; Size = MAP_APPFONT ( 130 , 12 ) ; @@ -225,6 +240,7 @@ ModalDialog RID_SANE_DIALOG }; NumericField RID_SCAN_NUMERIC_VECTOR_BOX { + HelpID = "extensions:NumericField:RID_SANE_DIALOG:RID_SCAN_NUMERIC_VECTOR_BOX"; Border = TRUE ; Spin = TRUE ; Repeat = TRUE ; @@ -233,6 +249,7 @@ ModalDialog RID_SANE_DIALOG }; PushButton RID_SCAN_BUTTON_OPTION_BTN { + HelpID = "extensions:PushButton:RID_SANE_DIALOG:RID_SCAN_BUTTON_OPTION_BTN"; Pos = MAP_APPFONT ( SECOND_COLUMN , 234 ) ; Size = MAP_APPFONT ( 130 , 14 ) ; Text [ en-US ] = "Set" ; diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx index 0f4e05b41..83fce0735 100644 --- a/extensions/source/scanner/scanner.cxx +++ b/extensions/source/scanner/scanner.cxx @@ -43,13 +43,14 @@ REF( XInterface ) SAL_CALL ScannerManager_CreateInstance( const REF( com::sun::s ScannerManager::ScannerManager() : mpData( NULL ) { + AcquireData(); } // ----------------------------------------------------------------------------- ScannerManager::~ScannerManager() { - DestroyData(); + ReleaseData(); } // ----------------------------------------------------------------------------- diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx index 3fae6e8dc..a1179e6a6 100644 --- a/extensions/source/scanner/scanner.hxx +++ b/extensions/source/scanner/scanner.hxx @@ -73,7 +73,8 @@ protected: vos::OMutex maProtector; void* mpData; - void DestroyData(); + void AcquireData(); + void ReleaseData(); public: @@ -105,7 +106,7 @@ public: void Unlock() { maProtector.release(); } void* GetData() const { return mpData; } - void SetData( void* pData ) { DestroyData(); mpData = pData; } + void SetData( void* pData ) { ReleaseData(); mpData = pData; } }; // ----------------------------------------------------------------------------- diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index f40253497..242fa3e99 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -31,6 +31,7 @@ #include <sanedlg.hxx> #include <vos/thread.hxx> #include <tools/list.hxx> +#include <boost/shared_ptr.hpp> #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> @@ -113,12 +114,41 @@ struct SaneHolder vos::OMutex m_aProtector; ScanError m_nError; bool m_bBusy; + + SaneHolder() : m_nError(ScanError_ScanErrorNone), m_bBusy(false) {} }; -DECLARE_LIST( SaneHolderList, SaneHolder* ) +namespace +{ + typedef std::vector< boost::shared_ptr<SaneHolder> > sanevec; + class allSanes + { + private: + int mnRefCount; + public: + sanevec m_aSanes; + allSanes() : mnRefCount(0) {} + void acquire(); + void release(); + }; + + void allSanes::acquire() + { + ++mnRefCount; + } + + void allSanes::release() + { + // was unused, now because of i99835: "Scanning interface not SANE API + // compliant" destroy all SaneHolder to get Sane Dtor called + --mnRefCount; + if (!mnRefCount) + m_aSanes.clear(); + } -static SaneHolderList allSanes; -static vos::OMutex aSaneProtector; + struct theSaneProtector : public rtl::Static<vos::OMutex, theSaneProtector> {}; + struct theSanes : public rtl::Static<allSanes, theSanes> {}; +} // ----------------- // - ScannerThread - @@ -126,7 +156,7 @@ static vos::OMutex aSaneProtector; class ScannerThread : public vos::OThread { - SaneHolder* m_pHolder; + boost::shared_ptr<SaneHolder> m_pHolder; REF( com::sun::star::lang::XEventListener ) m_xListener; ScannerManager* m_pManager; // just for the disposing call @@ -134,7 +164,7 @@ public: virtual void run(); virtual void onTerminated() { delete this; } public: - ScannerThread( SaneHolder* pHolder, + ScannerThread( boost::shared_ptr<SaneHolder> pHolder, const REF( com::sun::star::lang::XEventListener )& listener, ScannerManager* pManager ); virtual ~ScannerThread(); @@ -143,7 +173,7 @@ public: // ----------------------------------------------------------------------------- ScannerThread::ScannerThread( - SaneHolder* pHolder, + boost::shared_ptr<SaneHolder> pHolder, const REF( com::sun::star::lang::XEventListener )& listener, ScannerManager* pManager ) : m_pHolder( pHolder ), m_xListener( listener ), m_pManager( pManager ) @@ -192,16 +222,16 @@ void ScannerThread::run() // - ScannerManager - // ------------------ -void ScannerManager::DestroyData() +void ScannerManager::AcquireData() { - // was unused, now because of i99835: "Scanning interface not SANE API compliant" - // delete all SaneHolder to get Sane Dtor called - int i; - for ( i = allSanes.Count(); i > 0; i-- ) - { - SaneHolder *pSaneHolder = allSanes.GetObject(i-1); - if ( pSaneHolder ) delete pSaneHolder; - } + vos::OGuard aGuard( theSaneProtector::get() ); + theSanes::get().acquire(); +} + +void ScannerManager::ReleaseData() +{ + vos::OGuard aGuard( theSaneProtector::get() ); + theSanes::get().release(); } // ----------------------------------------------------------------------------- @@ -224,17 +254,14 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw() SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw() { - vos::OGuard aGuard( aSaneProtector ); + vos::OGuard aGuard( theSaneProtector::get() ); + sanevec &rSanes = theSanes::get().m_aSanes; - if( ! allSanes.Count() ) + if( rSanes.empty() ) { - SaneHolder* pSaneHolder = new SaneHolder; - pSaneHolder->m_nError = ScanError_ScanErrorNone; - pSaneHolder->m_bBusy = false; + boost::shared_ptr<SaneHolder> pSaneHolder(new SaneHolder); if( Sane::IsSane() ) - allSanes.Insert( pSaneHolder ); - else - delete pSaneHolder; + rSanes.push_back( pSaneHolder ); } if( Sane::IsSane() ) @@ -252,20 +279,21 @@ SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw() BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw( ScannerException ) { - vos::OGuard aGuard( aSaneProtector ); + vos::OGuard aGuard( theSaneProtector::get() ); + sanevec &rSanes = theSanes::get().m_aSanes; #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "ScannerManager::configureScanner\n" ); #endif - if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= allSanes.Count() ) + if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( ::rtl::OUString::createFromAscii( "Scanner does not exist" ), REF( XScannerManager )( this ), ScanError_InvalidContext ); - SaneHolder* pHolder = allSanes.GetObject( scanner_context.InternalData ); + boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; if( pHolder->m_bBusy ) throw ScannerException( ::rtl::OUString::createFromAscii( "Scanner is busy" ), @@ -286,19 +314,20 @@ BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw( void ScannerManager::startScan( const ScannerContext& scanner_context, const REF( com::sun::star::lang::XEventListener )& listener ) throw( ScannerException ) { - vos::OGuard aGuard( aSaneProtector ); + vos::OGuard aGuard( theSaneProtector::get() ); + sanevec &rSanes = theSanes::get().m_aSanes; #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "ScannerManager::startScan\n" ); #endif - if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= allSanes.Count() ) + if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( ::rtl::OUString::createFromAscii( "Scanner does not exist" ), REF( XScannerManager )( this ), ScanError_InvalidContext ); - SaneHolder* pHolder = allSanes.GetObject( scanner_context.InternalData ); + boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; if( pHolder->m_bBusy ) throw ScannerException( ::rtl::OUString::createFromAscii( "Scanner is busy" ), @@ -315,16 +344,17 @@ void ScannerManager::startScan( const ScannerContext& scanner_context, ScanError ScannerManager::getError( const ScannerContext& scanner_context ) throw( ScannerException ) { - vos::OGuard aGuard( aSaneProtector ); + vos::OGuard aGuard( theSaneProtector::get() ); + sanevec &rSanes = theSanes::get().m_aSanes; - if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= allSanes.Count() ) + if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( ::rtl::OUString::createFromAscii( "Scanner does not exist" ), REF( XScannerManager )( this ), ScanError_InvalidContext ); - SaneHolder* pHolder = allSanes.GetObject( scanner_context.InternalData ); + boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; return pHolder->m_nError; } @@ -333,15 +363,16 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_context ) throw( ScannerException ) { - vos::OGuard aGuard( aSaneProtector ); + vos::OGuard aGuard( theSaneProtector::get() ); + sanevec &rSanes = theSanes::get().m_aSanes; - if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= allSanes.Count() ) + if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( ::rtl::OUString::createFromAscii( "Scanner does not exist" ), REF( XScannerManager )( this ), ScanError_InvalidContext ); - SaneHolder* pHolder = allSanes.GetObject( scanner_context.InternalData ); + boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; vos::OGuard aProtGuard( pHolder->m_aProtector ); diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index ebdee62d3..1febb7200 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -74,10 +74,7 @@ using namespace ::com::sun::star; #define FIXTODOUBLE( nFix ) ((double)nFix.Whole+(double)nFix.Frac/65536.) #define FIXTOLONG( nFix ) ((long)floor(FIXTODOUBLE(nFix)+0.5)) -#if defined WIN -#define TWAIN_LIBNAME "TWAIN.DLL" -#define TWAIN_FUNCNAME "DSM_Entry" -#elif defined WNT +#if defined WNT #define TWAIN_LIBNAME "TWAIN_32.DLL" #define TWAIN_FUNCNAME "DSM_Entry" #endif @@ -109,7 +106,7 @@ class ImpTwain : public ::cppu::WeakImplHelper1< util::XCloseListener > TW_IDENTITY aSrcIdent; Link aNotifyLink; DSMENTRYPROC pDSM; - NAMESPACE_VOS( OModule )* pMod; + vos:: OModule * pMod; ULONG nCurState; HWND hTwainWnd; HHOOK hTwainHook; @@ -887,7 +884,11 @@ static Twain aTwain; // - ScannerManager - // ------------------ -void ScannerManager::DestroyData() +void ScannerManager::AcquireData() +{ +} + +void ScannerManager::ReleaseData() { if( mpData ) { @@ -979,7 +980,7 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw() } GlobalUnlock( hDIB ); - DestroyData(); + ReleaseData(); } return aRet; @@ -1009,7 +1010,7 @@ BOOL SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext ) if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) ) throw ScannerException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scanner does not exist" ) ), xThis, ScanError_InvalidContext ); - DestroyData(); + ReleaseData(); return aTwain.SelectSource( *this ); } @@ -1025,7 +1026,7 @@ void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const u if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) ) throw ScannerException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scanner does not exist" ) ), xThis, ScanError_InvalidContext ); - DestroyData(); + ReleaseData(); aTwain.PerformTransfer( *this, rxListener ); } diff --git a/extensions/source/scanner/scn.component b/extensions/source/scanner/scn.component new file mode 100644 index 000000000..d7daf3ae3 --- /dev/null +++ b/extensions/source/scanner/scn.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.scanner.ScannerManager"> + <service name="com.sun.star.scanner.ScannerManager"/> + </implementation> +</component> diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx index 1ac61483d..93fe9dbdc 100644 --- a/extensions/source/scanner/scnserv.cxx +++ b/extensions/source/scanner/scnserv.cxx @@ -45,37 +45,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char* *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -// ----------------------- -// - component_writeInfo - -// ----------------------- - -extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - sal_Bool bRet = sal_False; - - if( pRegistryKey ) - { - try - { - ::rtl::OUString aImplName( '/' ); - - aImplName += ScannerManager::getImplementationName_Static(); - aImplName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES/" ) ); - aImplName += ScannerManager::getImplementationName_Static(); - - REF( XRegistryKey ) xNewKey1( static_cast< XRegistryKey* >( pRegistryKey )->createKey( aImplName ) ); - - bRet = sal_True; - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return bRet; -} - // ------------------------ // - component_getFactory - // ------------------------ diff --git a/extensions/source/scanner/twain.cxx b/extensions/source/scanner/twain.cxx index 8f8261bd5..28532b733 100644 --- a/extensions/source/scanner/twain.cxx +++ b/extensions/source/scanner/twain.cxx @@ -31,7 +31,7 @@ #include <string.h> #include <math.h> -#if defined( WNT ) || defined (WIN) +#if defined( WNT ) #include <tools/svwin.h> #endif #ifdef OS2 @@ -52,10 +52,7 @@ #define FIXTODOUBLE( nFix ) ((double)nFix.Whole+(double)nFix.Frac/65536.) #define FIXTOLONG( nFix ) ((long)floor(FIXTODOUBLE(nFix)+0.5)) -#if defined WIN -#define TWAIN_LIBNAME "TWAIN.DLL" -#define TWAIN_FUNCNAME "DSM_Entry" -#elif defined WNT +#if defined WNT #define TWAIN_LIBNAME "TWAIN_32.DLL" #define TWAIN_FUNCNAME "DSM_Entry" #elif defined OS2 @@ -242,7 +239,7 @@ void ImpTwain::ImplOpenSourceManager() { if( 1 == nCurState ) { - pMod = new NAMESPACE_VOS( OModule )(); + pMod = new vos:: OModule (); if( pMod->load( TWAIN_LIBNAME ) ) { diff --git a/extensions/source/scanner/twain.hxx b/extensions/source/scanner/twain.hxx index faa3bcc76..3116f5a65 100644 --- a/extensions/source/scanner/twain.hxx +++ b/extensions/source/scanner/twain.hxx @@ -57,7 +57,7 @@ class ImpTwain Link aNotifyLink; Bitmap aBitmap; DSMENTRYPROC pDSM; - NAMESPACE_VOS( OModule )* pMod; + vos:: OModule * pMod; ULONG nCurState; void ImplCreate(); diff --git a/extensions/source/svg/svguno.cxx b/extensions/source/svg/svguno.cxx index ba1a5824d..38cf50eab 100644 --- a/extensions/source/svg/svguno.cxx +++ b/extensions/source/svg/svguno.cxx @@ -60,36 +60,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -// ----------------------- -// - component_writeInfo - -// ----------------------- - -extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - sal_Bool bRet = sal_False; - - if( pRegistryKey ) - { - try - { - REF( NMSP_REGISTRY::XRegistryKey ) xNewKey1( - static_cast< NMSP_REGISTRY::XRegistryKey* >( pRegistryKey )->createKey( - B2UCONST( "/com.sun.star.comp.extensions.SVGWriter/UNO/SERVICES/com.sun.star.svg.SVGWriter" ) ) ); - REF( NMSP_REGISTRY::XRegistryKey ) xNewKey2( - static_cast< NMSP_REGISTRY::XRegistryKey* >( pRegistryKey )->createKey( - B2UCONST( "/com.sun.star.comp.extensions.SVGPrinter/UNO/SERVICES/com.sun.star.svg.SVGPrinter" ) ) ); - - bRet = sal_True; - } - catch( NMSP_REGISTRY::InvalidRegistryException& ) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return bRet; -} - // ------------------------ // - component_getFactory - // ------------------------ diff --git a/extensions/source/update/check/makefile.mk b/extensions/source/update/check/makefile.mk index 9f5f54410..47da869ea 100644 --- a/extensions/source/update/check/makefile.mk +++ b/extensions/source/update/check/makefile.mk @@ -132,3 +132,11 @@ $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-onlineupdate.xcu : $(XCU_SOURCEDIR)$/Jobs @$(COPY) $< $@ # @$(PERL) transform.pl < $< > $@ + +ALLTAR : $(MISC)/updchk.uno.component + +$(MISC)/updchk.uno.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + updchk.uno.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt updchk.uno.component diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index 04c4d932f..d8d95540a 100644..100755 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -327,13 +327,14 @@ void SAL_CALL UpdateCheckJob::queryTermination( lang::EventObject const & ) } //------------------------------------------------------------------------------ -void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & rEvt ) +void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & ) throw ( uno::RuntimeException ) { if ( m_pInitThread.get() != 0 ) + { m_pInitThread->setTerminating(); - - disposing( rEvt ); + m_pInitThread->join(); + } } } // anonymous namespace @@ -387,18 +388,6 @@ component_getImplementationEnvironment( const sal_Char **aEnvTypeName, uno_Envir //------------------------------------------------------------------------------ -extern "C" sal_Bool SAL_CALL -component_writeInfo(void *pServiceManager, void *pRegistryKey) -{ - return cppu::component_writeInfoHelper( - pServiceManager, - pRegistryKey, - kImplementations_entries - ); -} - -//------------------------------------------------------------------------------ - extern "C" void * component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index abb05a480..92ecd5ae4 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -69,6 +69,7 @@ #include <com/sun/star/resource/XResourceBundleLoader.hpp> #include "updatehdl.hrc" +#include <tools/urlobj.hxx> #define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s)) @@ -158,7 +159,7 @@ void UpdateHandler::setDownloadBtnLabel( bool bAppendDots ) aLabel += UNISTRING( "..." ); setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], UNISTRING("Label"), uno::Any( aLabel ) ); - setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_DOWNLOAD2 ) ) ); + setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD2 ) ) ); mbDownloadBtnHasDots = bAppendDots; } @@ -1174,7 +1175,7 @@ void UpdateHandler::createDialog() xPropSet->setPropertyValue( UNISTRING("PositionY"), uno::Any(sal_Int32( 100 )) ); xPropSet->setPropertyValue( UNISTRING("Width"), uno::Any(sal_Int32( DIALOG_WIDTH )) ); xPropSet->setPropertyValue( UNISTRING("Height"), uno::Any(sal_Int32( DIALOG_HEIGHT )) ); - xPropSet->setPropertyValue( UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_DLG ) ) ); + xPropSet->setPropertyValue( UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DLG ) ) ); } { // Label (fixed text) <status> uno::Sequence< beans::NamedValue > aProps(1); @@ -1201,7 +1202,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 3, UNISTRING("MultiLine"), uno::Any( true ) ); setProperty( aProps, 4, UNISTRING("ReadOnly"), uno::Any( true ) ); setProperty( aProps, 5, UNISTRING("AutoVScroll"), uno::Any( true ) ); - setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_STATUS ) ) ); + setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_STATUS ) ) ); insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_STATUS, awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET, @@ -1232,7 +1233,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) ); setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msPauseBtn ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_PAUSE ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_PAUSE ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[PAUSE_BUTTON], awt::Rectangle( BOX1_BTN_X, BOX1_BTN_Y, BUTTON_WIDTH, BUTTON_HEIGHT ), @@ -1245,7 +1246,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) ); setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msResumeBtn ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_RESUME ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_RESUME ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[RESUME_BUTTON], awt::Rectangle( BOX1_BTN_X, @@ -1261,7 +1262,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) ); setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msCancelBtn ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_CANCEL ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CANCEL ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[CANCEL_BUTTON], awt::Rectangle( BOX1_BTN_X, @@ -1295,7 +1296,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 3, UNISTRING("MultiLine"), uno::Any( true ) ); setProperty( aProps, 4, UNISTRING("ReadOnly"), uno::Any( true ) ); setProperty( aProps, 5, UNISTRING("AutoVScroll"), uno::Any( true ) ); - setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_DESCRIPTION ) ) ); + setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DESCRIPTION ) ) ); insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_DESCRIPTION, awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET, @@ -1325,7 +1326,7 @@ void UpdateHandler::createDialog() // setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_CANCEL) ) ); // [property] string Label // only if PushButtonType_STANDARD setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msClose ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_CLOSE ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CLOSE ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[ CLOSE_BUTTON ], awt::Rectangle( CLOSE_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ), @@ -1338,7 +1339,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) ); setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msInstall ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_INSTALL ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_INSTALL ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[INSTALL_BUTTON], awt::Rectangle( INSTALL_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ), @@ -1351,7 +1352,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) ); setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msDownload ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_DOWNLOAD ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[DOWNLOAD_BUTTON], awt::Rectangle( DOWNLOAD_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ), diff --git a/extensions/source/update/check/updchk.uno.component b/extensions/source/update/check/updchk.uno.component new file mode 100644 index 000000000..b1eb32917 --- /dev/null +++ b/extensions/source/update/check/updchk.uno.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="vnd.sun.UpdateCheck"> + <service name="com.sun.star.setup.UpdateCheck"/> + </implementation> + <implementation name="vnd.sun.UpdateCheckConfig"> + <service name="com.sun.star.setup.UpdateCheckConfig"/> + </implementation> +</component> diff --git a/extensions/source/update/feed/makefile.mk b/extensions/source/update/feed/makefile.mk index 7e12970dd..6361f20bd 100644 --- a/extensions/source/update/feed/makefile.mk +++ b/extensions/source/update/feed/makefile.mk @@ -62,3 +62,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk + +ALLTAR : $(MISC)/updatefeed.component + +$(MISC)/updatefeed.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + updatefeed.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt updatefeed.component diff --git a/extensions/source/update/feed/updatefeed.component b/extensions/source/update/feed/updatefeed.component new file mode 100644 index 000000000..2d53ff5f9 --- /dev/null +++ b/extensions/source/update/feed/updatefeed.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="vnd.sun.UpdateInformationProvider"> + <service name="com.sun.star.deployment.UpdateInformationProvider"/> + </implementation> +</component> diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 9053c4456..b0db10d1c 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -851,18 +851,6 @@ component_getImplementationEnvironment( const sal_Char **aEnvTypeName, uno_Envir //------------------------------------------------------------------------------ -extern "C" sal_Bool SAL_CALL -component_writeInfo(void *pServiceManager, void *pRegistryKey) -{ - return cppu::component_writeInfoHelper( - pServiceManager, - pRegistryKey, - kImplementations_entries - ); -} - -//------------------------------------------------------------------------------ - extern "C" void * component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { diff --git a/extensions/source/update/ui/makefile.mk b/extensions/source/update/ui/makefile.mk index c4826efba..5ea6994d3 100644 --- a/extensions/source/update/ui/makefile.mk +++ b/extensions/source/update/ui/makefile.mk @@ -72,3 +72,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk + +ALLTAR : $(MISC)/updchk.component + +$(MISC)/updchk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + updchk.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt updchk.component diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 55aebaff8..e23a26464 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -1059,18 +1059,6 @@ component_getImplementationEnvironment( const sal_Char **aEnvTypeName, uno_Envir //------------------------------------------------------------------------------ -extern "C" sal_Bool SAL_CALL -component_writeInfo(void *pServiceManager, void *pRegistryKey) -{ - return cppu::component_writeInfoHelper( - pServiceManager, - pRegistryKey, - kImplementations_entries - ); -} - -//------------------------------------------------------------------------------ - extern "C" void * component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { diff --git a/extensions/source/update/ui/updchk.component b/extensions/source/update/ui/updchk.component new file mode 100644 index 000000000..bd533e30d --- /dev/null +++ b/extensions/source/update/ui/updchk.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="vnd.sun.UpdateCheckUI"> + <service name="com.sun.star.setup.UpdateCheckUI"/> + </implementation> +</component> diff --git a/extensions/source/xmlextract/makefile.mk b/extensions/source/xmlextract/makefile.mk index 0a021027f..fa54df738 100644 --- a/extensions/source/xmlextract/makefile.mk +++ b/extensions/source/xmlextract/makefile.mk @@ -63,3 +63,11 @@ SHL1LIBS= $(SLB)$/$(TARGET).lib # --- Targets ---------------------------------- .INCLUDE : target.mk + +ALLTAR : $(MISC)/xmx.component + +$(MISC)/xmx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + xmx.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt xmx.component diff --git a/extensions/source/xmlextract/xmx.component b/extensions/source/xmlextract/xmx.component new file mode 100644 index 000000000..456ff33b6 --- /dev/null +++ b/extensions/source/xmlextract/xmx.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.io.XMLExtractor"> + <service name="com.sun.star.io.XMLExtractor"/> + </implementation> +</component> diff --git a/extensions/source/xmlextract/xmxuno.cxx b/extensions/source/xmlextract/xmxuno.cxx index 2d4dfd7f8..5af30267e 100644 --- a/extensions/source/xmlextract/xmxuno.cxx +++ b/extensions/source/xmlextract/xmxuno.cxx @@ -52,27 +52,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( - void * /*pServiceManager*/, void * pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - REF( NMSP_REGISTRY::XRegistryKey ) xNewKey( - reinterpret_cast< NMSP_REGISTRY::XRegistryKey * >( pRegistryKey )->createKey( - NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM("/com.sun.star.comp.io.XMLExtractor/UNO/SERVICES/com.sun.star.io.XMLExtractor") ) ) ); - - return sal_True; - } - catch (NMSP_REGISTRY::InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - return sal_False; -} -//================================================================================================== void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx index 7d4e33c77..142bd8147 100644 --- a/extensions/test/stm/datatest.cxx +++ b/extensions/test/stm/datatest.cxx @@ -53,10 +53,8 @@ #include "testfactreg.hxx" -#ifndef _VOS_NO_NAMESPACE using namespace vos; using namespace usr; -#endif #define DATASTREAM_TEST_MAX_HANDLE 1 diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx index 96eb7c4e2..e2cff6339 100644 --- a/extensions/test/stm/marktest.cxx +++ b/extensions/test/stm/marktest.cxx @@ -50,12 +50,8 @@ #include "testfactreg.hxx" -#ifndef _VOS_NO_NAMESPACE using namespace vos; using namespace usr; -#endif - - class OMarkableOutputStreamTest : public XSimpleTest, diff --git a/extensions/test/stm/pipetest.cxx b/extensions/test/stm/pipetest.cxx index b72f0a08f..e9840d2b8 100644 --- a/extensions/test/stm/pipetest.cxx +++ b/extensions/test/stm/pipetest.cxx @@ -48,10 +48,8 @@ #define IMPLEMENTATION_NAME L"test.com.sun.star.comp.extensions.stm.Pipe" #define SERVICE_NAME L"test.com.sun.star.io.Pipe" -#ifndef _VOS_NO_NAMESPACE using namespace vos; using namespace usr; -#endif class WriteToStreamThread : public OThread diff --git a/extensions/test/stm/testfactreg.cxx b/extensions/test/stm/testfactreg.cxx index 23b9b9a6d..bbbfa1cb4 100644 --- a/extensions/test/stm/testfactreg.cxx +++ b/extensions/test/stm/testfactreg.cxx @@ -35,10 +35,8 @@ #include "testfactreg.hxx" -#ifndef _VOS_NO_NAMESPACE using namespace vos; using namespace usr; -#endif #ifdef __cplusplus extern "C" diff --git a/extensions/workben/testpgp.cxx b/extensions/workben/testpgp.cxx index 7981f0b7c..c6ae35bad 100644 --- a/extensions/workben/testpgp.cxx +++ b/extensions/workben/testpgp.cxx @@ -555,7 +555,7 @@ BOOL install ( String aModule ("module://"); char pBuffer[1024]; - NAMESPACE_VOS(ORealDynamicLoader)::computeModuleName ( + vos::ORealDynamicLoader::computeModuleName ( prefix, pBuffer, sizeof(pBuffer)); aModule += pBuffer; @@ -573,7 +573,7 @@ BOOL uninstall ( String aModule ("module://"); char pBuffer[1024]; - NAMESPACE_VOS(ORealDynamicLoader)::computeModuleName ( + vos::ORealDynamicLoader::computeModuleName ( prefix, pBuffer, sizeof(pBuffer)); aModule += pBuffer; diff --git a/forms/prj/build.lst b/forms/prj/build.lst index cc71868b7..2d7c5f49c 100644 --- a/forms/prj/build.lst +++ b/forms/prj/build.lst @@ -16,3 +16,4 @@ fm forms\source\runtime nmake - all frm_runtime NULL fm forms\util nmake - all fm_util fm_component fm_solar_component fm_solar_control fm_helper fm_misc fm_resource fm_richtext frm_runtime fm_xforms NULL fm forms\qa nmake - all fm_qa NULL fm forms\qa\unoapi nmake - all fm_qa_unoapi NULL +fm forms\qa\complex\forms nmake - all fm_qa_complex NULL diff --git a/forms/prj/d.lst b/forms/prj/d.lst index de1655d7d..a708dd3e3 100644 --- a/forms/prj/d.lst +++ b/forms/prj/d.lst @@ -5,3 +5,4 @@ ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res ..\util\*.xml %_DEST%\xml%_EXT%\*.xml +..\%__SRC%\misc\frm.component %_DEST%\xml%_EXT%\frm.component diff --git a/forms/qa/complex/forms/CheckOGroupBoxModel.java b/forms/qa/complex/forms/CheckOGroupBoxModel.java index b1d42ba60..175349a29 100755 --- a/forms/qa/complex/forms/CheckOGroupBoxModel.java +++ b/forms/qa/complex/forms/CheckOGroupBoxModel.java @@ -24,7 +24,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - package complex.forms; import com.sun.star.beans.Property; @@ -37,88 +36,127 @@ import com.sun.star.drawing.XControlShape; import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; -import complexlib.ComplexTestCase; -import java.io.PrintWriter; +// import complexlib.ComplexTestCase; +import com.sun.star.util.CloseVetoException; +import com.sun.star.util.XCloseable; import java.util.Vector; +import java.util.logging.Level; +import java.util.logging.Logger; import util.FormTools; import util.SOfficeFactory; import util.ValueChanger; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + /** */ -public class CheckOGroupBoxModel extends ComplexTestCase { - - private XMultiPropertySet xPropSet = null; - - public String[] getTestMethodNames() { - return new String[] {"setPropertyValues"}; - } - - public void before() { - XComponent xDrawDoc = null; - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) param.getMSF())); - - try { - log.println("creating a draw document"); - xDrawDoc = SOF.createDrawDoc(null); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace((PrintWriter)log); - failed("Couldn't create document."); +public class CheckOGroupBoxModel +{ + + private XMultiPropertySet m_xPropSet; + private XComponent m_xDrawDoc; + +// public String[] getTestMethodNames() { +// return new String[] {"setPropertyValues"}; +// } + @Before public void before() + { + // XComponent xDrawDoc = null; + SOfficeFactory SOF = SOfficeFactory.getFactory(getMSF()); + + try + { + System.out.println("creating a draw document"); + m_xDrawDoc = SOF.createDrawDoc(null); + } + catch (com.sun.star.uno.Exception e) + { + fail("Couldn't create document."); } String objName = "GroupBox"; - XControlShape shape = FormTools.insertControlShape(xDrawDoc, 5000, 7000, 2000, 2000, objName); - xPropSet = (XMultiPropertySet)UnoRuntime.queryInterface(XMultiPropertySet.class, shape.getControl()); + XControlShape shape = FormTools.insertControlShape(m_xDrawDoc, 5000, 7000, 2000, 2000, objName); + m_xPropSet = UnoRuntime.queryInterface(XMultiPropertySet.class, shape.getControl()); } - - public void setPropertyValues() { + @After public void after() + { + XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, m_xDrawDoc); + if (xClose != null) + { + try + { + xClose.close(true); + } + catch (CloseVetoException ex) + { + fail("Can't close document. Exception caught: " + ex.getMessage()); + /* ignore! */ + } + } + } + @Test public void setPropertyValues() + { String[] boundPropsToTest = getBoundPropsToTest(); MyChangeListener ml = new MyChangeListener(); - xPropSet.addPropertiesChangeListener(boundPropsToTest, ml); + m_xPropSet.addPropertiesChangeListener(boundPropsToTest, ml); - Object[] gValues = xPropSet.getPropertyValues(boundPropsToTest); + Object[] gValues = m_xPropSet.getPropertyValues(boundPropsToTest); Object[] newValue = new Object[gValues.length]; - log.println("Trying to change all properties."); - for (int i=0; i<boundPropsToTest.length; i++) { + System.out.println("Trying to change all properties."); + for (int i = 0; i < boundPropsToTest.length; i++) + { newValue[i] = ValueChanger.changePValue(gValues[i]); } - try { - xPropSet.setPropertyValues(boundPropsToTest, newValue); - } catch (com.sun.star.beans.PropertyVetoException e) { - e.printStackTrace((PrintWriter)log); - failed("Exception occured while trying to change the properties."); - } catch (com.sun.star.lang.IllegalArgumentException e) { - e.printStackTrace((PrintWriter)log); - failed("Exception occured while trying to change the properties."); - } catch (com.sun.star.lang.WrappedTargetException e) { - e.printStackTrace((PrintWriter)log); - failed("Exception occured while trying to change the properties."); + try + { + m_xPropSet.setPropertyValues(boundPropsToTest, newValue); + } + catch (com.sun.star.beans.PropertyVetoException e) + { + fail("Exception occured while trying to change the properties."); + } + catch (com.sun.star.lang.IllegalArgumentException e) + { + fail("Exception occured while trying to change the properties."); + } + catch (com.sun.star.lang.WrappedTargetException e) + { + fail("Exception occured while trying to change the properties."); } // end of try-catch - assure("Listener was not called.", ml.wasListenerCalled()); - xPropSet.removePropertiesChangeListener(ml); + assertTrue("Listener was not called.", ml.wasListenerCalled()); + m_xPropSet.removePropertiesChangeListener(ml); } - private String[] getBoundPropsToTest() { - Property[] properties = xPropSet.getPropertySetInfo().getProperties(); + private String[] getBoundPropsToTest() + { + Property[] properties = m_xPropSet.getPropertySetInfo().getProperties(); String[] testPropsNames = null; - Vector tNames = new Vector(); + Vector<String> tNames = new Vector<String>(); - for (int i = 0; i < properties.length; i++) { + for (int i = 0; i < properties.length; i++) + { Property property = properties[i]; String name = property.Name; - boolean isWritable = ((property.Attributes & - PropertyAttribute.READONLY) == 0); - boolean isNotNull = ((property.Attributes & - PropertyAttribute.MAYBEVOID) == 0); - boolean isBound = ((property.Attributes & - PropertyAttribute.BOUND) != 0); - - if ( isWritable && isNotNull && isBound) { + boolean isWritable = ((property.Attributes + & PropertyAttribute.READONLY) == 0); + boolean isNotNull = ((property.Attributes + & PropertyAttribute.MAYBEVOID) == 0); + boolean isBound = ((property.Attributes + & PropertyAttribute.BOUND) != 0); + + if (isWritable && isNotNull && isBound) + { tNames.add(name); } @@ -126,22 +164,59 @@ public class CheckOGroupBoxModel extends ComplexTestCase { //get a array of bound properties testPropsNames = new String[tNames.size()]; - testPropsNames = (String[])tNames.toArray(testPropsNames); + testPropsNames = tNames.toArray(testPropsNames); return testPropsNames; } /** - * Listener implementation which sets a flag when - * listener was called. - */ - public class MyChangeListener implements XPropertiesChangeListener { + * Listener implementation which sets a flag when + * listener was called. + */ + public class MyChangeListener implements XPropertiesChangeListener + { + boolean propertiesChanged = false; - public void propertiesChange(PropertyChangeEvent[] e) { - propertiesChanged = true; + + public void propertiesChange(PropertyChangeEvent[] e) + { + propertiesChanged = true; + } + + public void disposing(EventObject obj) + { + } + + public boolean wasListenerCalled() + { + return propertiesChanged; + } + + public void reset() + { + propertiesChanged = false; } - public void disposing (EventObject obj) {} - public boolean wasListenerCalled() { return propertiesChanged; } - public void reset() { propertiesChanged = false; } }; + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass + public static void setUpConnection() throws Exception + { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass + public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + private static final OfficeConnection connection = new OfficeConnection(); } diff --git a/forms/qa/complex/forms/makefile.mk b/forms/qa/complex/forms/makefile.mk index 6caf244cd..c5895b708 100755 --- a/forms/qa/complex/forms/makefile.mk +++ b/forms/qa/complex/forms/makefile.mk @@ -25,54 +25,93 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = CheckOGroupBoxModel -PRJNAME = $(TARGET) -PACKAGE = complex$/forms - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar -JAVAFILES = CheckOGroupBoxModel.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +PRJ = ../../.. +PRJNAME = forms +TARGET = qa_complex_forms -#----- make a jar from compiled files ------------------------------ +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/forms -MAXLINELENGTH = 100000 +# here store only Files which contain a @Test +JAVATESTFILES = \ + CheckOGroupBoxModel.java -JARCLASSDIRS = $(PACKAGE) +# put here all other files +JAVAFILES = $(JAVATESTFILES) -# --- Parameters for the test -------------------------------------- -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = -.ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -# test base is java complex -CT_TESTBASE = -TestBase java_complex +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -# build up package name with "." instead of $/ -CT_PACKAGE = -o $(PACKAGE:s\$/\.\) +.END -# start the runner application -CT_APP = org.openoffice.Runner +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -# --- Targets ------------------------------------------------------ +ALLTAR : javatest -.IF "$(depend)" == "" -run : ALLTAR -.ELSE -run : ALLDEP -.ENDIF +.END -.INCLUDE : target.mk -run: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_PACKAGE).$(JAVAFILES:b) +# +# +# +# PRJ = ..$/..$/.. +# TARGET = CheckOGroupBoxModel +# PRJNAME = $(TARGET) +# PACKAGE = complex$/forms +# +# # --- Settings ----------------------------------------------------- +# .INCLUDE: settings.mk +# +# +# #----- compile .java files ----------------------------------------- +# +# JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar +# JAVAFILES = CheckOGroupBoxModel.java +# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) +# +# #----- make a jar from compiled files ------------------------------ +# +# MAXLINELENGTH = 100000 +# +# JARCLASSDIRS = $(PACKAGE) +# +# # --- Parameters for the test -------------------------------------- +# +# # start an office if the parameter is set for the makefile +# .IF "$(OFFICE)" == "" +# CT_APPEXECCOMMAND = +# .ELSE +# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" +# .ENDIF +# +# # test base is java complex +# CT_TESTBASE = -TestBase java_complex +# +# # build up package name with "." instead of $/ +# CT_PACKAGE = -o $(PACKAGE:s\$/\.\) +# +# # start the runner application +# CT_APP = org.openoffice.Runner +# +# # --- Targets ------------------------------------------------------ +# +# .IF "$(depend)" == "" +# run : ALLTAR +# .ELSE +# run : ALLDEP +# .ENDIF +# +# .INCLUDE : target.mk +# +# run: +# +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_PACKAGE).$(JAVAFILES:b) diff --git a/forms/qa/unoapi/forms.sce b/forms/qa/unoapi/forms.sce index 073472f03..8ac840e7c 100644 --- a/forms/qa/unoapi/forms.sce +++ b/forms/qa/unoapi/forms.sce @@ -24,7 +24,7 @@ -o forms.OImageButtonModel -o forms.OImageControlControl -o forms.OImageControlModel --o forms.OListBoxControl +#i114669 -o forms.OListBoxControl -o forms.OListBoxModel -o forms.ONavigationBarControl -o forms.ONavigationBarModel diff --git a/forms/qa/unoapi/knownissues.xcl b/forms/qa/unoapi/knownissues.xcl index 2e10a269c..eb8efe91b 100644 --- a/forms/qa/unoapi/knownissues.xcl +++ b/forms/qa/unoapi/knownissues.xcl @@ -125,5 +125,11 @@ forms.OFileControlModel::com::sun::star::form::FormControlModel forms.OImageControlModel::com::sun::star::beans::XMultiPropertySet forms.OImageControlModel::com::sun::star::beans::XPropertySet +### i113201 ### +forms.OEditModel::com::sun::star::form::validation::XValidatableFormComponent + +### i114209 ### +forms.OGridControlModel::com::sun::star::view::XSelectionSupplier + ### i111333 ### forms.OImageControlControl::com::sun::star::awt::XControl diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index a0c32617c..a6f9e6441 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -439,7 +439,7 @@ void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( Ru void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::com::sun::star::uno::RuntimeException) { // Asynchron fuer starutil::URL-Button - sal_uInt32 n = Application::PostUserEvent( LINK(this, OButtonControl,OnClick) ); + ULONG n = Application::PostUserEvent( LINK(this, OButtonControl,OnClick) ); { ::osl::MutexGuard aGuard( m_aMutex ); m_nClickEvent = n; diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index b875bb340..41ed4974e 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -127,7 +127,7 @@ class OButtonControl :public OButtonControl_BASE ,public OFormNavigationHelper { private: - sal_uInt32 m_nClickEvent; + ULONG m_nClickEvent; sal_Int16 m_nTargetUrlFeatureId; /// caches the value of the "Enabled" property of our model sal_Bool m_bEnabledByPropertyValue; diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index b80b4b4a4..2f4cf4bfa 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -104,7 +104,8 @@ void OCurrencyModel::implConstruct() try { // get the system international informations - const LocaleDataWrapper& aLocaleInfo = SvtSysLocale().GetLocaleData(); + const SvtSysLocale aSysLocale; + const LocaleDataWrapper& aLocaleInfo = aSysLocale.GetLocaleData(); ::rtl::OUString sCurrencySymbol; sal_Bool bPrependCurrencySymbol; diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 251363655..902f853c9 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -507,14 +507,12 @@ DBG_NAME(OControlModel) //------------------------------------------------------------------ Sequence<sal_Int8> SAL_CALL OControlModel::getImplementationId() throw(RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::getImplementationId" ); return OImplementationIds::getImplementationId(getTypes()); } //------------------------------------------------------------------ Sequence<Type> SAL_CALL OControlModel::getTypes() throw(RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::getTypes" ); TypeBag aTypes( _getTypes() ); Reference< XTypeProvider > xProv; @@ -527,7 +525,6 @@ Sequence<Type> SAL_CALL OControlModel::getTypes() throw(RuntimeException) //------------------------------------------------------------------------------ Sequence<Type> OControlModel::_getTypes() { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::_getTypes" ); return TypeBag( OComponentHelper::getTypes(), OPropertySetAggregationHelper::getTypes(), OControlModel_BASE::getTypes() @@ -537,7 +534,6 @@ Sequence<Type> OControlModel::_getTypes() //------------------------------------------------------------------ Any SAL_CALL OControlModel::queryAggregation(const Type& _rType) throw (RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::queryAggregation" ); // base class 1 Any aReturn(OComponentHelper::queryAggregation(_rType)); @@ -561,7 +557,6 @@ Any SAL_CALL OControlModel::queryAggregation(const Type& _rType) throw (RuntimeE //------------------------------------------------------------------------------ void OControlModel::readHelpTextCompatibly(const staruno::Reference< stario::XObjectInputStream >& _rxInStream) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::readHelpTextCompatibly" ); ::rtl::OUString sHelpText; ::comphelper::operator>>( _rxInStream, sHelpText); try @@ -578,7 +573,6 @@ void OControlModel::readHelpTextCompatibly(const staruno::Reference< stario::XOb //------------------------------------------------------------------------------ void OControlModel::writeHelpTextCompatibly(const staruno::Reference< stario::XObjectOutputStream >& _rxOutStream) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::writeHelpTextCompatibly" ); ::rtl::OUString sHelpText; try { @@ -609,7 +603,6 @@ OControlModel::OControlModel( // the native look is ugly .... // #i37342# / 2004-11-19 / frank.schoenheit@sun.com { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::OControlModel" ); DBG_CTOR(OControlModel, NULL); if (_rUnoControlModelTypeName.getLength()) // the is a model we have to aggregate { @@ -651,7 +644,6 @@ OControlModel::OControlModel( const OControlModel* _pOriginal, const Reference< ,m_nTabIndex( FRM_DEFAULT_TABINDEX ) ,m_nClassId( FormComponentType::CONTROL ) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::OControlModel(copy)" ); DBG_CTOR( OControlModel, NULL ); DBG_ASSERT( _pOriginal, "OControlModel::OControlModel: invalid original!" ); @@ -696,14 +688,12 @@ OControlModel::~OControlModel() //------------------------------------------------------------------ void OControlModel::clonedFrom( const OControlModel* /*_pOriginal*/ ) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::clonedFrom" ); // nothing to do in this base class } //------------------------------------------------------------------------------ void OControlModel::doResetDelegator() { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::doResetDelegator" ); if (m_xAggregate.is()) m_xAggregate->setDelegator(NULL); } @@ -711,7 +701,6 @@ void OControlModel::doResetDelegator() //------------------------------------------------------------------------------ void OControlModel::doSetDelegator() { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::doSetDelegator" ); increment(m_refCount); if (m_xAggregate.is()) { @@ -724,14 +713,12 @@ void OControlModel::doSetDelegator() //------------------------------------------------------------------------------ InterfaceRef SAL_CALL OControlModel::getParent() throw(RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::getParent" ); return m_xParent; } //------------------------------------------------------------------------------ void SAL_CALL OControlModel::setParent(const InterfaceRef& _rxParent) throw(com::sun::star::lang::NoSupportException, RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::setParent" ); osl::MutexGuard aGuard(m_aMutex); Reference<XComponent> xComp(m_xParent, UNO_QUERY); @@ -749,7 +736,6 @@ void SAL_CALL OControlModel::setParent(const InterfaceRef& _rxParent) throw(com: //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OControlModel::getName() throw(RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::getName" ); ::rtl::OUString aReturn; OPropertySetHelper::getFastPropertyValue(PROPERTY_ID_NAME) >>= aReturn; return aReturn; @@ -758,7 +744,6 @@ void SAL_CALL OControlModel::setParent(const InterfaceRef& _rxParent) throw(com: //------------------------------------------------------------------------------ void SAL_CALL OControlModel::setName(const ::rtl::OUString& _rName) throw(RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::setName" ); setFastPropertyValue(PROPERTY_ID_NAME, makeAny(_rName)); } @@ -766,7 +751,6 @@ void SAL_CALL OControlModel::setName(const ::rtl::OUString& _rName) throw(Runtim //------------------------------------------------------------------------------ sal_Bool SAL_CALL OControlModel::supportsService(const rtl::OUString& _rServiceName) throw ( RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::supportsService" ); Sequence<rtl::OUString> aSupported = getSupportedServiceNames(); const rtl::OUString* pSupported = aSupported.getConstArray(); for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported) @@ -778,7 +762,6 @@ sal_Bool SAL_CALL OControlModel::supportsService(const rtl::OUString& _rServiceN //------------------------------------------------------------------------------ Sequence< ::rtl::OUString > OControlModel::getAggregateServiceNames() { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::getAggregateServiceNames" ); Sequence< ::rtl::OUString > aAggServices; Reference< XServiceInfo > xInfo; if ( query_aggregation( m_xAggregate, xInfo ) ) @@ -789,7 +772,6 @@ Sequence< ::rtl::OUString > OControlModel::getAggregateServiceNames() //------------------------------------------------------------------------------ Sequence<rtl::OUString> SAL_CALL OControlModel::getSupportedServiceNames() throw(RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::getSupportedServiceNames" ); return ::comphelper::concatSequences( getAggregateServiceNames(), getSupportedServiceNames_Static() @@ -799,7 +781,6 @@ Sequence<rtl::OUString> SAL_CALL OControlModel::getSupportedServiceNames() throw //------------------------------------------------------------------------------ Sequence< ::rtl::OUString > SAL_CALL OControlModel::getSupportedServiceNames_Static() throw( RuntimeException ) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::getSupportedServiceNames_Static" ); Sequence< ::rtl::OUString > aServiceNames( 2 ); aServiceNames[ 0 ] = FRM_SUN_FORMCOMPONENT; aServiceNames[ 1 ] = ::rtl::OUString::createFromAscii( "com.sun.star.form.FormControlModel" ); @@ -810,7 +791,6 @@ Sequence< ::rtl::OUString > SAL_CALL OControlModel::getSupportedServiceNames_Sta //------------------------------------------------------------------------------ void SAL_CALL OControlModel::disposing(const com::sun::star::lang::EventObject& _rSource) throw (RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::disposing" ); // release the parent if (_rSource.Source == m_xParent) { @@ -832,7 +812,6 @@ void SAL_CALL OControlModel::disposing(const com::sun::star::lang::EventObject& //----------------------------------------------------------------------------- void OControlModel::disposing() { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::disposing" ); OPropertySetAggregationHelper::disposing(); Reference<com::sun::star::lang::XComponent> xComp; @@ -847,7 +826,6 @@ void OControlModel::disposing() //------------------------------------------------------------------------------ void OControlModel::writeAggregate( const Reference< XObjectOutputStream >& _rxOutStream ) const { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::writeAggregate" ); Reference< XPersistObject > xPersist; if ( query_aggregation( m_xAggregate, xPersist ) ) xPersist->write( _rxOutStream ); @@ -856,7 +834,6 @@ void OControlModel::writeAggregate( const Reference< XObjectOutputStream >& _rxO //------------------------------------------------------------------------------ void OControlModel::readAggregate( const Reference< XObjectInputStream >& _rxInStream ) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::readAggregate" ); Reference< XPersistObject > xPersist; if ( query_aggregation( m_xAggregate, xPersist ) ) xPersist->read( _rxInStream ); @@ -866,7 +843,6 @@ void OControlModel::readAggregate( const Reference< XObjectInputStream >& _rxInS void SAL_CALL OControlModel::write(const Reference<stario::XObjectOutputStream>& _rxOutStream) throw(stario::IOException, RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::write" ); osl::MutexGuard aGuard(m_aMutex); // 1. Schreiben des UnoControls @@ -912,7 +888,6 @@ void SAL_CALL OControlModel::write(const Reference<stario::XObjectOutputStream>& //------------------------------------------------------------------------------ void OControlModel::read(const Reference<stario::XObjectInputStream>& InStream) throw (::com::sun::star::io::IOException, RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::read" ); osl::MutexGuard aGuard(m_aMutex); Reference<stario::XMarkableStream> xMark(InStream, UNO_QUERY); @@ -966,7 +941,6 @@ void OControlModel::read(const Reference<stario::XObjectInputStream>& InStream) //------------------------------------------------------------------------------ PropertyState OControlModel::getPropertyStateByHandle( sal_Int32 _nHandle ) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::getPropertyStateByHandle" ); // simply compare the current and the default value Any aCurrentValue = getPropertyDefaultByHandle( _nHandle ); Any aDefaultValue; getFastPropertyValue( aDefaultValue, _nHandle ); @@ -983,7 +957,6 @@ PropertyState OControlModel::getPropertyStateByHandle( sal_Int32 _nHandle ) //------------------------------------------------------------------------------ void OControlModel::setPropertyToDefaultByHandle( sal_Int32 _nHandle) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::setPropertyToDefaultByHandle" ); Any aDefault = getPropertyDefaultByHandle( _nHandle ); Any aConvertedValue, aOldValue; @@ -997,7 +970,6 @@ void OControlModel::setPropertyToDefaultByHandle( sal_Int32 _nHandle) //------------------------------------------------------------------------------ Any OControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::getPropertyDefaultByHandle" ); Any aReturn; switch ( _nHandle ) { @@ -1030,7 +1002,6 @@ Any OControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const //------------------------------------------------------------------------------ void OControlModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::getFastPropertyValue" ); switch ( _nHandle ) { case PROPERTY_ID_NAME: @@ -1062,7 +1033,6 @@ sal_Bool OControlModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) throw (com::sun::star::lang::IllegalArgumentException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::convertFastPropertyValue" ); sal_Bool bModified(sal_False); switch (_nHandle) { @@ -1092,7 +1062,6 @@ sal_Bool OControlModel::convertFastPropertyValue( void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (Exception) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::setFastPropertyValue_NoBroadcast" ); switch (_nHandle) { case PROPERTY_ID_NAME: @@ -1125,7 +1094,6 @@ void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const A //------------------------------------------------------------------------------ void OControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::describeFixedProperties" ); BEGIN_DESCRIBE_BASE_PROPERTIES( 4 ) DECL_PROP2 (CLASSID, sal_Int16, READONLY, TRANSIENT); DECL_PROP1 (NAME, ::rtl::OUString, BOUND); @@ -1137,7 +1105,6 @@ void OControlModel::describeFixedProperties( Sequence< Property >& _rProps ) con //------------------------------------------------------------------------------ void OControlModel::describeAggregateProperties( Sequence< Property >& /* [out] */ _rAggregateProps ) const { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::describeAggregateProperties" ); if ( m_xAggregateSet.is() ) { Reference< XPropertySetInfo > xPSI( m_xAggregateSet->getPropertySetInfo() ); @@ -1149,14 +1116,12 @@ void OControlModel::describeAggregateProperties( Sequence< Property >& /* [out] //------------------------------------------------------------------------------ ::osl::Mutex& OControlModel::getMutex() { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::getMutex" ); return m_aMutex; } //------------------------------------------------------------------------------ void OControlModel::describeFixedAndAggregateProperties( Sequence< Property >& _out_rFixedProperties, Sequence< Property >& _out_rAggregateProperties ) const { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::describeFixedAndAggregateProperties" ); describeFixedProperties( _out_rFixedProperties ); describeAggregateProperties( _out_rAggregateProperties ); } @@ -1164,49 +1129,42 @@ void OControlModel::describeFixedAndAggregateProperties( Sequence< Property >& _ //------------------------------------------------------------------------------ Reference< XMultiPropertySet > OControlModel::getPropertiesInterface() { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::getPropertiesInterface" ); return Reference< XMultiPropertySet >( *this, UNO_QUERY ); } //------------------------------------------------------------------------------ Reference< XPropertySetInfo> SAL_CALL OControlModel::getPropertySetInfo() throw( RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::getPropertySetInfo" ); return createPropertySetInfo( getInfoHelper() ); } //------------------------------------------------------------------------------ ::cppu::IPropertyArrayHelper& OControlModel::getInfoHelper() { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::getInfoHelper" ); return m_aPropertyBagHelper.getInfoHelper(); } //-------------------------------------------------------------------- void SAL_CALL OControlModel::addProperty( const ::rtl::OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::addProperty" ); m_aPropertyBagHelper.addProperty( _rName, _nAttributes, _rInitialValue ); } //-------------------------------------------------------------------- void SAL_CALL OControlModel::removeProperty( const ::rtl::OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::removeProperty" ); m_aPropertyBagHelper.removeProperty( _rName ); } //-------------------------------------------------------------------- Sequence< PropertyValue > SAL_CALL OControlModel::getPropertyValues() throw (RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::getPropertyValues" ); return m_aPropertyBagHelper.getPropertyValues(); } //-------------------------------------------------------------------- void SAL_CALL OControlModel::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::setPropertyValues" ); m_aPropertyBagHelper.setPropertyValues( _rProps ); } @@ -1249,7 +1207,6 @@ Any SAL_CALL OBoundControlModel::queryAggregation( const Type& _rType ) throw (R Any aReturn( OControlModel::queryAggregation(_rType) ); if (!aReturn.hasValue()) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::queryAggregation" ); aReturn = OBoundControlModel_BASE1::queryInterface(_rType); if ( !aReturn.hasValue() && m_bCommitable ) @@ -1427,10 +1384,19 @@ void OBoundControlModel::implInitValuePropertyListening( ) const } //----------------------------------------------------------------------------- +void OBoundControlModel::initOwnValueProperty( const ::rtl::OUString& i_rValuePropertyName ) +{ + OSL_PRECOND( !m_sValuePropertyName.getLength() && -1 == m_nValuePropertyAggregateHandle, + "OBoundControlModel::initOwnValueProperty: value property is already initialized!" ); + OSL_ENSURE( i_rValuePropertyName.getLength(), "OBoundControlModel::initOwnValueProperty: invalid property name!" ); + m_sValuePropertyName = i_rValuePropertyName; +} + +//----------------------------------------------------------------------------- void OBoundControlModel::initValueProperty( const ::rtl::OUString& _rValuePropertyName, sal_Int32 _nValuePropertyExternalHandle ) { OSL_PRECOND( !m_sValuePropertyName.getLength() && -1 == m_nValuePropertyAggregateHandle, - "OBoundControlModel::initValueProperty: already called before!" ); + "OBoundControlModel::initValueProperty: value property is already initialized!" ); OSL_ENSURE( _rValuePropertyName.getLength(), "OBoundControlModel::initValueProperty: invalid property name!" ); OSL_ENSURE( _nValuePropertyExternalHandle != -1, "OBoundControlModel::initValueProperty: invalid property handle!" ); @@ -1495,7 +1461,6 @@ Sequence< Type > OBoundControlModel::_getTypes() //----------------------------------------------------------------------------- void OBoundControlModel::disposing() { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::_getTypes" ); OControlModel::disposing(); ::osl::ClearableMutexGuard aGuard(m_aMutex); @@ -1533,6 +1498,29 @@ void OBoundControlModel::disposing() } //------------------------------------------------------------------------------ +void OBoundControlModel::onValuePropertyChange( ControlModelLock& i_rControLock ) +{ + if ( hasExternalValueBinding() ) + { // the control value changed, while we have an external value binding + // -> forward the value to it + if ( m_eControlValueChangeInstigator != eExternalBinding ) + transferControlValueToExternal( i_rControLock ); + } + else if ( !m_bCommitable && m_xColumnUpdate.is() ) + { // the control value changed, while we are bound to a database column, + // but not committable (which means changes in the control have to be reflected to + // the underlying database column immediately) + // -> forward the value to the database column + if ( m_eControlValueChangeInstigator != eDbColumnBinding ) + commitControlValueToDbColumn( false ); + } + + // validate the new value + if ( m_bSupportsValidation ) + recheckValidity( true ); +} + +//------------------------------------------------------------------------------ void OBoundControlModel::_propertyChanged( const PropertyChangeEvent& _rEvt ) throw ( RuntimeException ) { ControlModelLock aLock( *this ); @@ -1543,26 +1531,8 @@ void OBoundControlModel::_propertyChanged( const PropertyChangeEvent& _rEvt ) th "OBoundControlModel::_propertyChanged: where did this come from (2)?" ); if ( _rEvt.PropertyName == m_sValuePropertyName ) - { // our control value changed - - if ( hasExternalValueBinding() ) - { // the control value changed, while we have an external value binding - // -> forward the value to it - if ( m_eControlValueChangeInstigator != eExternalBinding ) - transferControlValueToExternal( aLock ); - } - else if ( !m_bCommitable && m_xColumnUpdate.is() ) - { // the control value changed, while we are bound to a database column, - // but not committable (which means changes in the control have to be reflected to - // the underlying database column immediately) - // -> forward the value to the database column - if ( m_eControlValueChangeInstigator != eDbColumnBinding ) - commitControlValueToDbColumn( false ); - } - - // validate the new value - if ( m_bSupportsValidation ) - recheckValidity( true ); + { + onValuePropertyChange( aLock ); } } @@ -1673,7 +1643,6 @@ void SAL_CALL OBoundControlModel::disposing(const com::sun::star::lang::EventObj //------------------------------------------------------------------------------ StringSequence SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::disposing" ); return ::comphelper::concatSequences( getAggregateServiceNames(), getSupportedServiceNames_Static() @@ -1696,7 +1665,6 @@ Sequence< ::rtl::OUString > SAL_CALL OBoundControlModel::getSupportedServiceName //------------------------------------------------------------------------------ void SAL_CALL OBoundControlModel::write( const Reference<stario::XObjectOutputStream>& _rxOutStream ) throw(stario::IOException, RuntimeException) { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::getSupportedServiceNames_Static" ); OControlModel::write(_rxOutStream); osl::MutexGuard aGuard(m_aMutex); @@ -1797,7 +1765,6 @@ void SAL_CALL OBoundControlModel::read( const Reference< stario::XObjectInputStr //------------------------------------------------------------------------------ void OBoundControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OBoundControlModel::getFastPropertyValue" ); switch (nHandle) { case PROPERTY_ID_INPUT_REQUIRED: @@ -1866,7 +1833,6 @@ sal_Bool OBoundControlModel::convertFastPropertyValue( //------------------------------------------------------------------------------ Any OBoundControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const { - // RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::convertFastPropertyValue" ); Any aDefault; switch ( _nHandle ) { diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index a69ec26a6..e9e2ce3e2 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -151,11 +151,14 @@ OImageControlModel::OImageControlModel(const Reference<XMultiServiceFactory>& _r :OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_IMAGECONTROL, FRM_SUN_CONTROL_IMAGECONTROL, sal_False, sal_False, sal_False ) // use the old control name for compytibility reasons ,m_pImageProducer( NULL ) + ,m_bExternalGraphic( true ) ,m_bReadOnly( sal_False ) + ,m_sImageURL() + ,m_xGraphicObject() { DBG_CTOR( OImageControlModel, NULL ); m_nClassId = FormComponentType::IMAGECONTROL; - initValueProperty( PROPERTY_IMAGE_URL, PROPERTY_ID_IMAGE_URL); + initOwnValueProperty( PROPERTY_IMAGE_URL ); implConstruct(); } @@ -165,22 +168,20 @@ OImageControlModel::OImageControlModel( const OImageControlModel* _pOriginal, co :OBoundControlModel( _pOriginal, _rxFactory ) // use the old control name for compytibility reasons ,m_pImageProducer( NULL ) + ,m_bExternalGraphic( true ) + ,m_bReadOnly( _pOriginal->m_bReadOnly ) + ,m_sImageURL( _pOriginal->m_sImageURL ) + ,m_xGraphicObject( _pOriginal->m_xGraphicObject ) { DBG_CTOR( OImageControlModel, NULL ); implConstruct(); - m_bReadOnly = _pOriginal->m_bReadOnly; osl_incrementInterlockedCount( &m_refCount ); { // simulate a propertyChanged event for the ImageURL // 2003-05-15 - #109591# - fs@openoffice.org - Any aImageURL; - getFastPropertyValue( aImageURL, PROPERTY_ID_IMAGE_URL ); - ::rtl::OUString sImageURL; - aImageURL >>= sImageURL; - ::osl::MutexGuard aGuard( m_aMutex ); - impl_handleNewImageURL_lck( sImageURL, eOther ); + impl_handleNewImageURL_lck( eOther ); } osl_decrementInterlockedCount( &m_refCount ); } @@ -190,6 +191,7 @@ void OImageControlModel::implConstruct() { m_pImageProducer = new ImageProducer; m_xImageProducer = m_pImageProducer; + m_pImageProducer->SetDoneHdl( LINK( this, OImageControlModel, OnImageImportDone ) ); } //------------------------------------------------------------------ @@ -243,32 +245,20 @@ sal_Bool OImageControlModel::approveDbColumnType( sal_Int32 _nColumnType ) return ImageStoreInvalid != lcl_getImageStoreType( _nColumnType ); } - -//------------------------------------------------------------------------------ -void OImageControlModel::_propertyChanged( const PropertyChangeEvent& _rEvent ) - throw( RuntimeException ) -{ - if ( m_xColumnUpdate.is() ) - { - OBoundControlModel::_propertyChanged( _rEvent ); - } - else - { // we're not bound. In this case, we have to manually care for updating the - // image producer, since the base class will not do this - ::rtl::OUString sImageURL; - _rEvent.NewValue >>= sImageURL; - - ::osl::MutexGuard aGuard( m_aMutex ); - impl_handleNewImageURL_lck( sImageURL, eOther ); - } -} - //------------------------------------------------------------------------------ void OImageControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const { switch (nHandle) { - case PROPERTY_ID_READONLY : rValue <<= (sal_Bool)m_bReadOnly; break; + case PROPERTY_ID_READONLY: + rValue <<= (sal_Bool)m_bReadOnly; + break; + case PROPERTY_ID_IMAGE_URL: + rValue <<= m_sImageURL; + break; + case PROPERTY_ID_GRAPHIC: + rValue <<= m_xGraphicObject.is() ? m_xGraphicObject->getGraphic() : Reference< XGraphic >(); + break; default: OBoundControlModel::getFastPropertyValue(rValue, nHandle); } @@ -284,8 +274,51 @@ void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, con m_bReadOnly = getBOOL(rValue); break; + case PROPERTY_ID_IMAGE_URL: + OSL_VERIFY( rValue >>= m_sImageURL ); + impl_handleNewImageURL_lck( eOther ); + { + ControlModelLock aLock( *this ); + // that's a fake ... onValuePropertyChange expects to receive the only lock to our instance, + // but we're already called with our mutex locked ... + onValuePropertyChange( aLock ); + } + break; + + case PROPERTY_ID_GRAPHIC: + { + Reference< XGraphic > xGraphic; + OSL_VERIFY( rValue >>= xGraphic ); + if ( !xGraphic.is() ) + m_xGraphicObject.clear(); + else + { + m_xGraphicObject = GraphicObject::create( m_aContext.getUNOContext() ); + m_xGraphicObject->setGraphic( xGraphic ); + } + + if ( m_bExternalGraphic ) + { + // if that's an external graphic, i.e. one which has not been loaded by ourselves in response to a + // new image URL, then also adjust our ImageURL. + ::rtl::OUString sNewImageURL; + if ( m_xGraphicObject.is() ) + { + sNewImageURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:" ) ); + sNewImageURL = sNewImageURL + m_xGraphicObject->getUniqueID(); + } + m_sImageURL = sNewImageURL; + // TODO: speaking strictly, this would need to be notified, since ImageURL is a bound property. However, + // this method here is called with a locked mutex, so we cannot simply call listeners ... + // I think the missing notification (and thus clients which potentially cannot observe the change) + // is less severe than the potential deadlock ... + } + } + break; + default: OBoundControlModel::setFastPropertyValue_NoBroadcast(nHandle, rValue); + break; } } @@ -298,6 +331,15 @@ sal_Bool OImageControlModel::convertFastPropertyValue(Any& rConvertedValue, Any& case PROPERTY_ID_READONLY : return tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bReadOnly); + case PROPERTY_ID_IMAGE_URL: + return tryPropertyValue( rConvertedValue, rOldValue, rValue, m_sImageURL ); + + case PROPERTY_ID_GRAPHIC: + { + const Reference< XGraphic > xGraphic( getFastPropertyValue( PROPERTY_ID_GRAPHIC ), UNO_QUERY ); + return tryPropertyValue( rConvertedValue, rOldValue, rValue, xGraphic ); + } + default: return OBoundControlModel::convertFastPropertyValue(rConvertedValue, rOldValue, nHandle, rValue); } @@ -306,13 +348,25 @@ sal_Bool OImageControlModel::convertFastPropertyValue(Any& rConvertedValue, Any& //------------------------------------------------------------------------------ void OImageControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const { - BEGIN_DESCRIBE_PROPERTIES( 2, OBoundControlModel ) - DECL_BOOL_PROP1 ( READONLY, BOUND ); - DECL_PROP1 ( TABINDEX, sal_Int16, BOUND ); + BEGIN_DESCRIBE_PROPERTIES( 4, OBoundControlModel ) + DECL_IFACE_PROP2( GRAPHIC, XGraphic, BOUND, TRANSIENT ); + DECL_PROP1 ( IMAGE_URL, ::rtl::OUString, BOUND ); + DECL_BOOL_PROP1 ( READONLY, BOUND ); + DECL_PROP1 ( TABINDEX, sal_Int16, BOUND ); END_DESCRIBE_PROPERTIES(); } //------------------------------------------------------------------------------ +void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [out] */ o_rAggregateProperties ) const +{ + OBoundControlModel::describeAggregateProperties( o_rAggregateProperties ); + // remove ImageULR and Graphic properties, we "overload" them. This is because our aggregate synchronizes those + // two, but we have an own sychronization mechanism. + RemoveProperty( o_rAggregateProperties, PROPERTY_IMAGE_URL ); + RemoveProperty( o_rAggregateProperties, PROPERTY_GRAPHIC ); +} + +//------------------------------------------------------------------------------ ::rtl::OUString OImageControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { return FRM_COMPONENT_IMAGECONTROL; // old (non-sun) name for compatibility ! @@ -410,18 +464,18 @@ sal_Bool OImageControlModel::impl_updateStreamForURL_lck( const ::rtl::OUString& } //------------------------------------------------------------------------------ -sal_Bool OImageControlModel::impl_handleNewImageURL_lck( const ::rtl::OUString& _rURL, ValueChangeInstigator _eInstigator ) +sal_Bool OImageControlModel::impl_handleNewImageURL_lck( ValueChangeInstigator _eInstigator ) { switch ( lcl_getImageStoreType( getFieldType() ) ) { case ImageStoreBinary: - if ( impl_updateStreamForURL_lck( _rURL, _eInstigator ) ) + if ( impl_updateStreamForURL_lck( m_sImageURL, _eInstigator ) ) return sal_True; break; case ImageStoreLink: { - ::rtl::OUString sCommitURL( _rURL ); + ::rtl::OUString sCommitURL( m_sImageURL ); if ( m_sDocumentURL.getLength() ) sCommitURL = URIHelper::simpleNormalizedMakeRelative( m_sDocumentURL, sCommitURL ); OSL_ENSURE( m_xColumnUpdate.is(), "OImageControlModel::impl_handleNewImageURL_lck: no bound field, but ImageStoreLink?!" ); @@ -434,7 +488,7 @@ sal_Bool OImageControlModel::impl_handleNewImageURL_lck( const ::rtl::OUString& break; case ImageStoreInvalid: - OSL_ENSURE( false, "OImageControlModel::impl_handleNewImageURL_lck: invalid current field type!" ); + OSL_ENSURE( false, "OImageControlModel::impl_handleNewImageURL_lck: image storage type type!" ); break; } @@ -461,10 +515,7 @@ sal_Bool OImageControlModel::commitControlValueToDbColumn( bool _bPostReset ) else { ::osl::MutexGuard aGuard(m_aMutex); - - ::rtl::OUString sImageURL; - m_xAggregateSet->getPropertyValue( PROPERTY_IMAGE_URL ) >>= sImageURL; - return impl_handleNewImageURL_lck( sImageURL, eDbColumnBinding ); + return impl_handleNewImageURL_lck( eDbColumnBinding ); } return sal_True; @@ -522,7 +573,13 @@ Any OImageControlModel::translateDbColumnToControlValue() { switch ( lcl_getImageStoreType( getFieldType() ) ) { - case ImageStoreBinary: return makeAny( m_xColumn->getBinaryStream() ); + case ImageStoreBinary: + { + Reference< XInputStream > xImageStream( m_xColumn->getBinaryStream() ); + if ( m_xColumn->wasNull() ) + xImageStream.clear(); + return makeAny( xImageStream ); + } case ImageStoreLink: { ::rtl::OUString sImageLink( m_xColumn->getString() ); @@ -538,6 +595,12 @@ Any OImageControlModel::translateDbColumnToControlValue() } //------------------------------------------------------------------------------ +Any OImageControlModel::getControlValue( ) const +{ + return makeAny( m_sImageURL ); +} + +//------------------------------------------------------------------------------ void OImageControlModel::doSetControlValue( const Any& _rValue ) { DBG_ASSERT( GetImageProducer() && m_xImageProducer.is(), "OImageControlModel::doSetControlValue: no image producer!" ); @@ -592,11 +655,6 @@ void OImageControlModel::doSetControlValue( const Any& _rValue ) void SAL_CALL OImageControlModel::disposing() { OBoundControlModel::disposing(); - - { - ::osl::MutexGuard aGuard( m_aMutex ); // setControlValue expects this - setControlValue( Any(), eOther ); - } } //------------------------------------------------------------------------------ @@ -630,6 +688,22 @@ void SAL_CALL OImageControlModel::startProduction( ) throw (RuntimeException) GetImageProducer()->startProduction(); } +//------------------------------------------------------------------------------ +IMPL_LINK( OImageControlModel, OnImageImportDone, ::Graphic*, i_pGraphic ) +{ + const Reference< XGraphic > xGraphic( i_pGraphic != NULL ? Image( i_pGraphic->GetBitmapEx() ).GetXGraphic() : NULL ); + m_bExternalGraphic = false; + try + { + setPropertyValue( PROPERTY_GRAPHIC, makeAny( xGraphic ) ); + } + catch ( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + m_bExternalGraphic = true; + return 1L; +} //================================================================== // OImageControlControl @@ -783,16 +857,16 @@ bool OImageControlControl::implInsertGraphics() implClearGraphics( sal_False ); sal_Bool bIsLink = sal_False; xController->getValue(ExtendedFilePickerElementIds::CHECKBOX_LINK, 0) >>= bIsLink; + // Force bIsLink to be TRUE if we're bound to a field. Though we initialized the file picker with IsLink=TRUE + // in this case, and disabled the respective control, there might be picker implementations which do not + // respect this, and return IsLink=FALSE here. In this case, "normalize" the flag. + // #i112659# / 2010-08-26 / frank.schoenheit@oracle.com + bIsLink |= bHasField; if ( !bIsLink ) { Graphic aGraphic; aDialog.GetGraphic( aGraphic ); - - Reference< graphic::XGraphicObject > xGrfObj = graphic::GraphicObject::create( m_aContext.getUNOContext() ); - xGrfObj->setGraphic( aGraphic.GetXGraphic() ); - rtl::OUString sObjectID( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:" ) ); - sObjectID = sObjectID + xGrfObj->getUniqueID(); - xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( ::rtl::OUString( sObjectID ) ) ); + xSet->setPropertyValue( PROPERTY_GRAPHIC, makeAny( aGraphic.GetXGraphic() ) ); } else xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( ::rtl::OUString( aDialog.GetPath() ) ) ); diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx index 3caa4cc82..cd47e15f3 100644 --- a/forms/source/component/ImageControl.hxx +++ b/forms/source/component/ImageControl.hxx @@ -33,6 +33,7 @@ #include <com/sun/star/form/XImageProducerSupplier.hpp> #include <com/sun/star/awt/XMouseListener.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> +#include <com/sun/star/graphic/XGraphicObject.hpp> #include <comphelper/propmultiplex.hxx> #include <comphelper/implementationreference.hxx> #include <cppuhelper/implbase2.hxx> @@ -57,7 +58,11 @@ class OImageControlModel { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer> m_xImageProducer; ImageProducer* m_pImageProducer; + bool m_bExternalGraphic; sal_Bool m_bReadOnly; + ::rtl::OUString m_sImageURL; + ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > + m_xGraphicObject; ::rtl::OUString m_sDocumentURL; protected: @@ -86,9 +91,6 @@ public: // OComponentHelper virtual void SAL_CALL disposing(); - // OPropertyChangeListener - virtual void _propertyChanged( const ::com::sun::star::beans::PropertyChangeEvent& ) throw(::com::sun::star::uno::RuntimeException); - // XPersistObject virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); @@ -103,6 +105,9 @@ public: virtual void SAL_CALL startProduction( ) throw (::com::sun::star::uno::RuntimeException); // OControlModel's property handling + virtual void describeAggregateProperties( + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps + ) const; virtual void describeFixedProperties( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps ) const; @@ -119,6 +124,8 @@ protected: translateDbColumnToControlValue( ); virtual sal_Bool commitControlValueToDbColumn( bool _bPostReset ); + virtual ::com::sun::star::uno::Any + getControlValue( ) const; virtual void doSetControlValue( const ::com::sun::star::uno::Any& _rValue ); virtual sal_Bool approveDbColumnType(sal_Int32 _nColumnType); @@ -134,12 +141,14 @@ protected: @precond our own mutex is locked */ - sal_Bool impl_handleNewImageURL_lck( const ::rtl::OUString& _rURL, ValueChangeInstigator _eInstigator ); + sal_Bool impl_handleNewImageURL_lck( ValueChangeInstigator _eInstigator ); /** updates the binary stream, created from loading the file which the given URL points to, into our bound field, or the control itself if there is no bound field */ sal_Bool impl_updateStreamForURL_lck( const ::rtl::OUString& _rURL, ValueChangeInstigator _eInstigator ); + + DECL_LINK( OnImageImportDone, ::Graphic* ); }; //================================================================== diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 1aab51738..f064772df 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -190,11 +190,7 @@ ErrCode ImgProdLockBytes::Stat( SvLockBytesStat* pStat, SvLockBytesStatFlag eFla ImageProducer::ImageProducer() : mpStm ( NULL ), - mpFilter ( NULL ), - mnStatus ( 0UL ), - mbConsInit ( sal_False ), - mnLastError ( 0UL ), - mbAsync ( sal_False ) + mbConsInit ( sal_False ) { mpGraphic = new Graphic; DBG_ASSERT( Application::GetFilterHdl().IsSet(), "ImageProducer::ImageProducer(): No filter handler set" ); @@ -207,9 +203,6 @@ ImageProducer::~ImageProducer() delete mpGraphic; mpGraphic = NULL; - delete mpFilter; - mpFilter = NULL; - delete mpStm; mpStm = NULL; @@ -261,7 +254,6 @@ void ImageProducer::SetImage( const ::rtl::OUString& rPath ) maURL = rPath; mpGraphic->Clear(); mbConsInit = sal_False; - mbAsync = sal_False; delete mpStm; if ( ::svt::GraphicAccess::isSupportedURL( maURL ) ) @@ -284,7 +276,6 @@ void ImageProducer::SetImage( SvStream& rStm ) maURL = ::rtl::OUString(); mpGraphic->Clear(); mbConsInit = sal_False; - mbAsync = sal_False; delete mpStm; mpStm = new SvStream( new ImgProdLockBytes( &rStm, sal_False ) ); @@ -297,7 +288,6 @@ void ImageProducer::setImage( ::com::sun::star::uno::Reference< ::com::sun::star maURL = ::rtl::OUString(); mpGraphic->Clear(); mbConsInit = sal_False; - mbAsync = sal_False; delete mpStm; if( rInputStmRef.is() ) @@ -318,9 +308,7 @@ void ImageProducer::NewDataAvailable() void ImageProducer::startProduction() throw(::com::sun::star::uno::RuntimeException) { - ResetLastError(); - - if( maConsList.Count() ) + if( maConsList.Count() || maDoneHdl.IsSet() ) { bool bNotifyEmptyGraphics = false; @@ -331,8 +319,8 @@ void ImageProducer::startProduction() throw(::com::sun::star::uno::RuntimeExcept // graphic is cleared if a new Stream is set if( ( mpGraphic->GetType() == GRAPHIC_NONE ) || mpGraphic->GetContext() ) { - if( !ImplImportGraphic( *mpGraphic ) && maErrorHdl.IsSet() ) - maErrorHdl.Call( this ); + if ( ImplImportGraphic( *mpGraphic ) && maDoneHdl.IsSet() ) + maDoneHdl.Call( mpGraphic ); } if( mpGraphic->GetType() != GRAPHIC_NONE ) @@ -363,6 +351,9 @@ void ImageProducer::startProduction() throw(::com::sun::star::uno::RuntimeExcept // delete interfaces in temporary list for( pCons = aTmp.First(); pCons; pCons = aTmp.Next() ) delete (::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer > *) pCons; + + if ( maDoneHdl.IsSet() ) + maDoneHdl.Call( NULL ); } } } @@ -371,33 +362,16 @@ void ImageProducer::startProduction() throw(::com::sun::star::uno::RuntimeExcept sal_Bool ImageProducer::ImplImportGraphic( Graphic& rGraphic ) { - USHORT nFilter = GRFILTER_FORMAT_DONTKNOW; - short nRet; - sal_Bool bRet = sal_False; - if( ERRCODE_IO_PENDING == mpStm->GetError() ) mpStm->ResetError(); mpStm->Seek( 0UL ); - if( mpFilter ) - nRet = mpFilter->ImportGraphic( rGraphic, String(), *mpStm, nFilter ); - else - { - if( GraphicConverter::Import( *mpStm, rGraphic ) == ERRCODE_NONE ) - nRet = GRFILTER_OK; - else - nRet = GRFILTER_FILTERERROR; - } + sal_Bool bRet = GraphicConverter::Import( *mpStm, rGraphic ) == ERRCODE_NONE; if( ERRCODE_IO_PENDING == mpStm->GetError() ) mpStm->ResetError(); - if( nRet == GRFILTER_OK ) - bRet = sal_True; - else - mnLastError = nRet; - return bRet; } @@ -405,10 +379,6 @@ sal_Bool ImageProducer::ImplImportGraphic( Graphic& rGraphic ) void ImageProducer::ImplUpdateData( const Graphic& rGraphic ) { - // asynchronous? - if( mpGraphic->GetContext() ) - mbAsync = sal_True; - ImplInitConsumer( rGraphic ); if( mbConsInit && maConsList.Count() ) @@ -425,7 +395,7 @@ void ImageProducer::ImplUpdateData( const Graphic& rGraphic ) // iterate through interfaces for( pCons = aTmp.First(); pCons; pCons = aTmp.Next() ) - ( *(::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer > *) pCons )->complete( mnStatus = ::com::sun::star::awt::ImageStatus::IMAGESTATUS_STATICIMAGEDONE, this ); + ( *(::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer > *) pCons )->complete( ::com::sun::star::awt::ImageStatus::IMAGESTATUS_STATICIMAGEDONE, this ); // delete interfaces in temporary list for( pCons = aTmp.First(); pCons; pCons = aTmp.Next() ) diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx index b81510e39..25e9f6f9d 100644 --- a/forms/source/component/imgprod.hxx +++ b/forms/source/component/imgprod.hxx @@ -64,20 +64,9 @@ private: List maConsList; Graphic* mpGraphic; SvStream* mpStm; - GraphicFilter* mpFilter; sal_uInt32 mnTransIndex; - sal_uInt32 mnStatus; sal_Bool mbConsInit; - sal_Bool mbStmDel; - Link maErrorHdl; - sal_uInt32 mnLastError; - - sal_uInt32 mnExtra2; - - sal_Bool mbAsync; - sal_Bool mbExtra1; - sal_Bool mbExtra2; - sal_Bool mbExtra3; + Link maDoneHdl; sal_Bool ImplImportGraphic( Graphic& rGraphic ); void ImplUpdateData( const Graphic& rGraphic ); @@ -92,14 +81,11 @@ public: void SetImage( const ::rtl::OUString& rPath ); void SetImage( SvStream& rStm ); - void SetErrorHandler( const Link& rErrorHdl ) { maErrorHdl = rErrorHdl; } - const Link& GetErrorHandler() const { return maErrorHdl; } - - sal_uInt32 GetLastError() const { return mnLastError; } - void ResetLastError() { mnLastError = 0; } - void NewDataAvailable(); + void SetDoneHdl( const Link& i_rHdl ) { maDoneHdl = i_rHdl; } + const Link& GetDoneHdl() const { return maDoneHdl; } + // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL acquire() throw() { OWeakObject::acquire(); } diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index deb57bd66..040a690bc 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -759,6 +759,18 @@ protected: sal_Int32 _nValuePropertyExternalHandle ); + /** initializes the part of the class which is related to the control value. + + <p>In opposite to ->initValueProperty, this method is to be used for value properties which are <em>not</em> + implemented by our aggregate, but by ourselves.</p> + + <p>Certain functionality is not available when using own value properties. This includes binding to an external + value and external validation. (This is not a conceptual limit, but simply missing implementation.)</p> + */ + void initOwnValueProperty( + const ::rtl::OUString& i_rValuePropertyName + ); + /** suspends listening at the value property <p>As long as this listening is suspended, changes in the value property will not be @@ -782,6 +794,16 @@ protected: */ void resumeValueListening( ); + /** (to be) called when the value property changed + + Normally, this is done automatically, since the value property is a property of our aggregate, and we're + a listener at this property. + However, in some cases the value property might not be an aggregate property, but a property of the + delegator instance. In this case, you'll need to call <code>onValuePropertyChange</code> whenever this + property changes. + */ + void onValuePropertyChange( ControlModelLock& i_rControLock ); + /** starts listening at the aggregate, for changes in the given property <p>The OBoundControlModel automatically registers a multiplexer which listens for diff --git a/forms/source/inc/forms_module.hxx b/forms/source/inc/forms_module.hxx index 4dac07f1b..0bf225c54 100644 --- a/forms/source/inc/forms_module.hxx +++ b/forms/source/inc/forms_module.hxx @@ -101,21 +101,6 @@ namespace FORMS_MODULE_NAMESPACE static void revokeComponent( const ::rtl::OUString& _rImplementationName); - /** write the registration information of all known components - <p>writes the registration information of all components which are currently registered into the - specified registry.<p/> - <p>Usually used from within component_writeInfo.<p/> - @param _rxServiceManager - the service manager - @param _rRootKey - the registry key under which the information will be stored - @return - sal_True if the registration of all implementations was successfull, sal_False otherwise - */ - static sal_Bool writeComponentInfos( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager, - const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rRootKey); - /** creates a Factory for the component with the given implementation name. <p>Usually used from within component_getFactory.<p/> @param _rxServiceManager diff --git a/forms/source/inc/forms_module_impl.hxx b/forms/source/inc/forms_module_impl.hxx index a360384c2..5e481c4b5 100644 --- a/forms/source/inc/forms_module_impl.hxx +++ b/forms/source/inc/forms_module_impl.hxx @@ -107,54 +107,6 @@ namespace FORMS_MODULE_NAMESPACE } //-------------------------------------------------------------------------- - sal_Bool OFormsModule::writeComponentInfos( - const Reference< XMultiServiceFactory >& /*_rxServiceManager*/, - const Reference< XRegistryKey >& _rxRootKey) - { - OSL_ENSURE(_rxRootKey.is(), "OFormsModule::writeComponentInfos : invalid argument !"); - - if (!s_pImplementationNames) - { - OSL_ASSERT("OFormsModule::writeComponentInfos : have no class infos ! Are you sure called this method at the right time ?"); - return sal_True; - } - OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, - "OFormsModule::writeComponentInfos : inconsistent state (the pointers) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), - "OFormsModule::writeComponentInfos : inconsistent state !"); - - sal_Int32 nLen = s_pImplementationNames->getLength(); - const ::rtl::OUString* pImplName = s_pImplementationNames->getConstArray(); - const Sequence< ::rtl::OUString >* pServices = s_pSupportedServices->getConstArray(); - - ::rtl::OUString sRootKey("/", 1, RTL_TEXTENCODING_ASCII_US); - for (sal_Int32 i=0; i<nLen; ++i, ++pImplName, ++pServices) - { - ::rtl::OUString aMainKeyName(sRootKey); - aMainKeyName += *pImplName; - aMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES"); - - try - { - Reference< XRegistryKey > xNewKey( _rxRootKey->createKey(aMainKeyName) ); - - const ::rtl::OUString* pService = pServices->getConstArray(); - for (sal_Int32 j=0; j<pServices->getLength(); ++j, ++pService) - xNewKey->createKey(*pService); - } - catch(Exception&) - { - OSL_ASSERT("OFormsModule::writeComponentInfos : something went wrong while creating the keys !"); - return sal_False; - } - } - - return sal_True; - } - - //-------------------------------------------------------------------------- Reference< XInterface > OFormsModule::getComponentFactory( const ::rtl::OUString& _rImplementationName, const Reference< XMultiServiceFactory >& _rxServiceManager) diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx index 1f57f425d..74581b9d8 100644 --- a/forms/source/inc/frm_strings.hxx +++ b/forms/source/inc/frm_strings.hxx @@ -141,6 +141,7 @@ namespace frm FORMS_CONSTASCII_STRING( PROPERTY_SUBMIT_METHOD, "SubmitMethod" ); FORMS_CONSTASCII_STRING( PROPERTY_SUBMIT_ENCODING, "SubmitEncoding" ); FORMS_CONSTASCII_STRING( PROPERTY_IMAGE_URL, "ImageURL" ); + FORMS_CONSTASCII_STRING( PROPERTY_GRAPHIC, "Graphic" ); FORMS_CONSTASCII_STRING( PROPERTY_IMAGE_POSITION, "ImagePosition" ); FORMS_CONSTASCII_STRING( PROPERTY_EMPTY_IS_NULL, "ConvertEmptyToNull" ); FORMS_CONSTASCII_STRING( PROPERTY_LISTSOURCETYPE, "ListSourceType" ); diff --git a/forms/source/inc/property.hrc b/forms/source/inc/property.hrc index e70dff4b2..3eddaa398 100644 --- a/forms/source/inc/property.hrc +++ b/forms/source/inc/property.hrc @@ -61,7 +61,7 @@ namespace frm #define PROPERTY_ID_WRITING_MODE (PROPERTY_ID_START + 20) #define PROPERTY_ID_CONTEXT_WRITING_MODE (PROPERTY_ID_START + 21) #define PROPERTY_ID_VERTICAL_ALIGN (PROPERTY_ID_START + 22) - // free +#define PROPERTY_ID_GRAPHIC (PROPERTY_ID_START + 23) // free // free // free diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx index 11d08f985..21498cc17 100644 --- a/forms/source/misc/property.cxx +++ b/forms/source/misc/property.cxx @@ -134,6 +134,7 @@ void PropertyInfoService::initialize() ADD_PROP_ASSIGNMENT(SUBMIT_METHOD); ADD_PROP_ASSIGNMENT(SUBMIT_ENCODING); ADD_PROP_ASSIGNMENT(IMAGE_URL); + ADD_PROP_ASSIGNMENT(GRAPHIC); ADD_PROP_ASSIGNMENT(EMPTY_IS_NULL); ADD_PROP_ASSIGNMENT(LISTSOURCETYPE); ADD_PROP_ASSIGNMENT(LISTSOURCE); diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx index 3cfa7efce..423276dc3 100644 --- a/forms/source/misc/services.cxx +++ b/forms/source/misc/services.cxx @@ -283,22 +283,6 @@ void ensureClassInfos() } -//--------------------------------------------------------------------------------------- -void registerServiceProvider(const ::rtl::OUString& _rServiceImplName, const Sequence< ::rtl::OUString >& _rServices, XRegistryKey* _pKey) -{ - ::rtl::OUString sMainKeyName = ::rtl::OUString::createFromAscii("/"); - sMainKeyName += _rServiceImplName; - sMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES"); - Reference< XRegistryKey > xNewKey = _pKey->createKey(sMainKeyName); - OSL_ENSURE(xNewKey.is(), "forms::registerProvider : could not create a registry key !"); - if (!xNewKey.is()) - return; - - const ::rtl::OUString* pSupportedServices = _rServices.getConstArray(); - for (sal_Int32 i=0; i<_rServices.getLength(); ++i, ++pSupportedServices) - xNewKey->createKey(*pSupportedServices); -} - //======================================================================================= extern "C" { @@ -342,57 +326,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const } //--------------------------------------------------------------------------------------- -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* _pServiceManager, XRegistryKey* _pRegistryKey) -{ - if (_pRegistryKey) - { - try - { - // ======================================================================== - // the real way - use the OModule - createRegistryInfo_FORMS(); - if ( !::frm::OFormsModule::writeComponentInfos( - static_cast<XMultiServiceFactory*>( _pServiceManager ), - static_cast<XRegistryKey*>( _pRegistryKey ) ) - ) - return sal_False; - - // ======================================================================== - // a lot of stuff which is implemented "manually" here in this file - - // collect the class infos - ensureClassInfos(); - - // both our static sequences should have the same length ... - sal_Int32 nClasses = s_aClassImplementationNames.getLength(); - OSL_ENSURE(s_aClassServiceNames.getLength() == nClasses, - "forms::component_writeInfo : invalid class infos !"); - - // loop through the sequences and register the service providers - const ::rtl::OUString* pClasses = s_aClassImplementationNames.getConstArray(); - const Sequence< ::rtl::OUString >* pServices = s_aClassServiceNames.getConstArray(); - - for (sal_Int32 i=0; i<nClasses; ++i, ++pClasses, ++pServices) - registerServiceProvider(*pClasses, *pServices, _pRegistryKey); - - s_aClassImplementationNames.realloc(0); - s_aClassServiceNames.realloc(0); - s_aFactories.realloc(0); - - return sal_True; - } - catch ( InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "forms::component_writeInfo : InvalidRegistryException !"); - } - } - s_aClassImplementationNames.realloc(0); - s_aClassServiceNames.realloc(0); - s_aFactories.realloc(0); - return sal_False; -} - -//--------------------------------------------------------------------------------------- SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) { if (!_pServiceManager || !_pImplName) diff --git a/forms/util/frm.component b/forms/util/frm.component new file mode 100644 index 000000000..c727e8059 --- /dev/null +++ b/forms/util/frm.component @@ -0,0 +1,255 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.form.ONavigationBarControl"> + <service name="com.sun.star.form.control.NavigationToolBar"/> + </implementation> + <implementation name="com.sun.star.comp.form.ONavigationBarModel"> + <service name="com.sun.star.form.FormComponent"/> + <service name="com.sun.star.form.FormControlModel"/> + <service name="com.sun.star.form.component.NavigationToolBar"/> + </implementation> + <implementation name="com.sun.star.comp.form.ORichTextControl"> + <service name="com.sun.star.form.control.RichTextControl"/> + </implementation> + <implementation name="com.sun.star.comp.forms.FormOperations"> + <service name="com.sun.star.form.runtime.FormOperations"/> + </implementation> + <implementation name="com.sun.star.comp.forms.ODatabaseForm"> + <service name="com.sun.star.form.FormComponent"/> + <service name="com.sun.star.form.FormComponents"/> + <service name="com.sun.star.form.component.DataForm"/> + <service name="com.sun.star.form.component.Form"/> + <service name="com.sun.star.form.component.HTMLForm"/> + <service name="stardiv.one.form.component.Form"/> + </implementation> + <implementation name="com.sun.star.comp.forms.OFilterControl"> + <service name="com.sun.star.awt.UnoControl"/> + <service name="com.sun.star.form.control.FilterControl"/> + </implementation> + <implementation name="com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"> + <service name="com.sun.star.form.binding.BindableDatabaseFormattedField"/> + <service name="com.sun.star.form.component.DatabaseFormattedField"/> + <service name="com.sun.star.form.component.FormattedField"/> + <service name="stardiv.one.form.component.FormattedField"/> + </implementation> + <implementation name="com.sun.star.comp.forms.ORichTextModel"> + <service name="com.sun.star.form.FormComponent"/> + <service name="com.sun.star.form.FormControlModel"/> + <service name="com.sun.star.form.component.RichTextControl"/> + <service name="com.sun.star.style.CharacterProperties"/> + <service name="com.sun.star.style.CharacterPropertiesAsian"/> + <service name="com.sun.star.style.CharacterPropertiesComplex"/> + <service name="com.sun.star.style.ParagraphProperties"/> + <service name="com.sun.star.style.ParagraphPropertiesComplex"/> + <service name="com.sun.star.text.TextRange"/> + </implementation> + <implementation name="com.sun.star.comp.forms.OScrollBarModel"> + <service name="com.sun.star.form.FormComponent"/> + <service name="com.sun.star.form.FormControlModel"/> + <service name="com.sun.star.form.binding.BindableIntegerValueRange"/> + <service name="com.sun.star.form.component.ScrollBar"/> + </implementation> + <implementation name="com.sun.star.comp.forms.OSpinButtonModel"> + <service name="com.sun.star.form.FormComponent"/> + <service name="com.sun.star.form.FormControlModel"/> + <service name="com.sun.star.form.binding.BindableIntegerValueRange"/> + <service name="com.sun.star.form.component.SpinButton"/> + </implementation> + <implementation name="com.sun.star.comp.xml.xpath.XFormsExtension"> + <service name="com.sun.star.xml.xpath.XPathExtension"/> + </implementation> + <implementation name="com.sun.star.form.ImageProducer"> + <service name="com.sun.star.awt.ImageProducer"/> + </implementation> + <implementation name="com.sun.star.form.Model"> + <service name="com.sun.star.xforms.Model"/> + </implementation> + <implementation name="com.sun.star.form.OButtonControl"> + <service name="com.sun.star.form.control.CommandButton"/> + <service name="stardiv.one.form.control.CommandButton"/> + </implementation> + <implementation name="com.sun.star.form.OButtonModel"> + <service name="com.sun.star.form.component.CommandButton"/> + <service name="stardiv.one.form.component.CommandButton"/> + </implementation> + <implementation name="com.sun.star.form.OCheckBoxControl"> + <service name="com.sun.star.form.control.CheckBox"/> + <service name="stardiv.one.form.control.CheckBox"/> + </implementation> + <implementation name="com.sun.star.form.OCheckBoxModel"> + <service name="com.sun.star.form.binding.BindableDatabaseCheckBox"/> + <service name="com.sun.star.form.component.CheckBox"/> + <service name="com.sun.star.form.component.DatabaseCheckBox"/> + <service name="stardiv.one.form.component.CheckBox"/> + </implementation> + <implementation name="com.sun.star.form.OComboBoxControl"> + <service name="com.sun.star.form.control.ComboBox"/> + <service name="stardiv.one.form.control.ComboBox"/> + </implementation> + <implementation name="com.sun.star.form.OComboBoxModel"> + <service name="com.sun.star.form.binding.BindableDatabaseComboBox"/> + <service name="com.sun.star.form.component.ComboBox"/> + <service name="com.sun.star.form.component.DatabaseComboBox"/> + <service name="stardiv.one.form.component.ComboBox"/> + </implementation> + <implementation name="com.sun.star.form.OCurrencyControl"> + <service name="com.sun.star.form.control.CurrencyField"/> + <service name="stardiv.one.form.control.CurrencyField"/> + </implementation> + <implementation name="com.sun.star.form.OCurrencyModel"> + <service name="com.sun.star.form.component.CurrencyField"/> + <service name="com.sun.star.form.component.DatabaseCurrencyField"/> + <service name="stardiv.one.form.component.CurrencyField"/> + </implementation> + <implementation name="com.sun.star.form.ODateControl"> + <service name="com.sun.star.form.control.DateField"/> + <service name="stardiv.one.form.control.DateField"/> + </implementation> + <implementation name="com.sun.star.form.ODateModel"> + <service name="com.sun.star.form.component.DatabaseDateField"/> + <service name="com.sun.star.form.component.DateField"/> + <service name="stardiv.one.form.component.DateField"/> + </implementation> + <implementation name="com.sun.star.form.OEditControl"> + <service name="com.sun.star.form.control.TextField"/> + <service name="stardiv.one.form.control.Edit"/> + <service name="stardiv.one.form.control.TextField"/> + </implementation> + <implementation name="com.sun.star.form.OEditModel"> + <service name="com.sun.star.form.binding.BindableDatabaseTextField"/> + <service name="com.sun.star.form.component.DatabaseTextField"/> + <service name="com.sun.star.form.component.TextField"/> + <service name="stardiv.one.form.component.TextField"/> + </implementation> + <implementation name="com.sun.star.form.OFileControlModel"> + <service name="com.sun.star.form.component.FileControl"/> + <service name="stardiv.one.form.component.FileControl"/> + </implementation> + <implementation name="com.sun.star.form.OFixedTextModel"> + <service name="com.sun.star.form.component.FixedText"/> + <service name="stardiv.one.form.component.FixedText"/> + </implementation> + <implementation name="com.sun.star.form.OFormattedControl"> + <service name="com.sun.star.form.control.FormattedField"/> + <service name="stardiv.one.form.control.FormattedField"/> + </implementation> + <implementation name="com.sun.star.form.OFormattedFieldWrapper"> + <service name="stardiv.one.form.component.Edit"/> + </implementation> + <implementation name="com.sun.star.form.OFormsCollection"> + <service name="com.sun.star.form.Forms"/> + </implementation> + <implementation name="com.sun.star.form.OGridControlModel"> + <service name="com.sun.star.form.component.GridControl"/> + <service name="stardiv.one.form.component.Grid"/> + <service name="stardiv.one.form.component.GridControl"/> + </implementation> + <implementation name="com.sun.star.form.OGroupBoxControl"> + <service name="com.sun.star.form.control.GroupBox"/> + <service name="stardiv.one.form.control.GroupBox"/> + </implementation> + <implementation name="com.sun.star.form.OGroupBoxModel"> + <service name="com.sun.star.form.component.GroupBox"/> + <service name="stardiv.one.form.component.GroupBox"/> + </implementation> + <implementation name="com.sun.star.form.OHiddenModel"> + <service name="com.sun.star.form.component.HiddenControl"/> + <service name="stardiv.one.form.component.Hidden"/> + <service name="stardiv.one.form.component.HiddenControl"/> + </implementation> + <implementation name="com.sun.star.form.OImageButtonControl"> + <service name="com.sun.star.form.control.ImageButton"/> + <service name="stardiv.one.form.control.ImageButton"/> + </implementation> + <implementation name="com.sun.star.form.OImageButtonModel"> + <service name="com.sun.star.form.component.ImageButton"/> + <service name="stardiv.one.form.component.ImageButton"/> + </implementation> + <implementation name="com.sun.star.form.OImageControlControl"> + <service name="com.sun.star.form.control.ImageControl"/> + <service name="stardiv.one.form.control.ImageControl"/> + </implementation> + <implementation name="com.sun.star.form.OImageControlModel"> + <service name="com.sun.star.form.component.DatabaseImageControl"/> + <service name="stardiv.one.form.component.ImageControl"/> + </implementation> + <implementation name="com.sun.star.form.OListBoxControl"> + <service name="com.sun.star.form.control.ListBox"/> + <service name="stardiv.one.form.control.ListBox"/> + </implementation> + <implementation name="com.sun.star.form.OListBoxModel"> + <service name="com.sun.star.form.binding.BindableDatabaseListBox"/> + <service name="com.sun.star.form.component.DatabaseListBox"/> + <service name="com.sun.star.form.component.ListBox"/> + <service name="stardiv.one.form.component.ListBox"/> + </implementation> + <implementation name="com.sun.star.form.ONumericControl"> + <service name="com.sun.star.form.control.NumericField"/> + <service name="stardiv.one.form.control.NumericField"/> + </implementation> + <implementation name="com.sun.star.form.ONumericModel"> + <service name="com.sun.star.form.binding.BindableDatabaseNumericField"/> + <service name="com.sun.star.form.component.DatabaseNumericField"/> + <service name="com.sun.star.form.component.NumericField"/> + <service name="stardiv.one.form.component.NumericField"/> + </implementation> + <implementation name="com.sun.star.form.OPatternControl"> + <service name="com.sun.star.form.control.PatternField"/> + <service name="stardiv.one.form.control.PatternField"/> + </implementation> + <implementation name="com.sun.star.form.OPatternModel"> + <service name="com.sun.star.form.component.DatabasePatternField"/> + <service name="com.sun.star.form.component.PatternField"/> + <service name="stardiv.one.form.component.PatternField"/> + </implementation> + <implementation name="com.sun.star.form.ORadioButtonControl"> + <service name="com.sun.star.form.control.RadioButton"/> + <service name="stardiv.one.form.control.RadioButton"/> + </implementation> + <implementation name="com.sun.star.form.ORadioButtonModel"> + <service name="com.sun.star.form.binding.BindableDatabaseRadioButton"/> + <service name="com.sun.star.form.component.DatabaseRadioButton"/> + <service name="com.sun.star.form.component.RadioButton"/> + <service name="stardiv.one.form.component.RadioButton"/> + </implementation> + <implementation name="com.sun.star.form.OTimeControl"> + <service name="com.sun.star.form.control.TimeField"/> + <service name="stardiv.one.form.control.TimeField"/> + </implementation> + <implementation name="com.sun.star.form.OTimeModel"> + <service name="com.sun.star.form.component.DatabaseTimeField"/> + <service name="com.sun.star.form.component.TimeField"/> + <service name="stardiv.one.form.component.TimeField"/> + </implementation> + <implementation name="com.sun.star.form.XForms"> + <service name="com.sun.star.xforms.XForms"/> + </implementation> +</component> diff --git a/forms/util/frm.dxp b/forms/util/frm.dxp index 9e59e9403..f0e1c6993 100644 --- a/forms/util/frm.dxp +++ b/forms/util/frm.dxp @@ -1,3 +1,2 @@ -component_writeInfo component_getImplementationEnvironment component_getFactory diff --git a/forms/util/makefile.mk b/forms/util/makefile.mk index 00d7a81d5..5ce7dd256 100644 --- a/forms/util/makefile.mk +++ b/forms/util/makefile.mk @@ -112,3 +112,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk @echo NavigationToolBar >>$@ @echo ONavigationBar >>$@ + +ALLTAR : $(MISC)/frm.component + +$(MISC)/frm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + frm.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt frm.component diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java index 8ceec83a7..30a222d3b 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java @@ -75,6 +75,9 @@ public class InstallData static private boolean databaseQueried = false; static private boolean useRtl = false; static private boolean installedProductMinorSet = false; + static private boolean isDebianSystem = false; + static private boolean useForceDebian = false; /* --force-debian */ + static private boolean debianInvestigated = false; static private String installType; /* custom or typical installation */ static private String osType; /* Linux, SunOS, ... */ static private String installDir = null; @@ -649,6 +652,30 @@ public class InstallData installedProductMinorSet = value; } + public boolean debianInvestigated() { + return debianInvestigated; + } + + public void setDebianInvestigated(boolean value) { + debianInvestigated = value; + } + + public boolean isDebianSystem() { + return isDebianSystem; + } + + public void setIsDebianSystem(boolean value) { + isDebianSystem = value; + } + + public boolean useForceDebian() { + return useForceDebian; + } + + public void setUseForceDebian(boolean value) { + useForceDebian = value; + } + public boolean databaseQueried() { return databaseQueried; } diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java index e99a93cb0..204c9e18e 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java @@ -190,8 +190,25 @@ public class LinuxInstaller extends Installer { if ( sofficeLink.exists() ) { useForce = true; } } - String rpmCommand = ""; - String[] rpmCommandArray; + // On Debian based systems, rpms can be installed with the switch --force-debian, if a rpm + // is installed. + + String forceDebianString = ""; + String nodepsString = ""; + + if ( ! data.debianInvestigated() ) { + helper.investigateDebian(data); + data.setDebianInvestigated(true); + } + + if ( data.isDebianSystem() ) { + nodepsString = "--nodeps"; + + if ( data.useForceDebian() ) { + forceDebianString = "--force-debian"; + } + } + String databasePath = null; String databaseString = ""; boolean useLocalDatabase = false; @@ -209,114 +226,57 @@ public class LinuxInstaller extends Installer { useLocalDatabase = true; } - if (useForce) { - if (useLocalDatabase) { - if ( relocations != null ) { - rpmCommand = "rpm --upgrade --ignoresize --force -vh " + - "--relocate " + relocations + " " + databaseString + - " " + databasePath + " " + packageName; - rpmCommandArray = new String[10]; - rpmCommandArray[0] = "rpm"; - rpmCommandArray[1] = "--upgrade"; - rpmCommandArray[2] = "--ignoresize"; - rpmCommandArray[3] = "--force"; - rpmCommandArray[4] = "-vh"; - rpmCommandArray[5] = "--relocate"; - rpmCommandArray[6] = relocations; - rpmCommandArray[7] = databaseString; - rpmCommandArray[8] = databasePath; - rpmCommandArray[9] = packageName; - } else { - rpmCommand = "rpm --upgrade --ignoresize --force -vh " + - databaseString + " " + databasePath + " " + packageName; - rpmCommandArray = new String[8]; - rpmCommandArray[0] = "rpm"; - rpmCommandArray[1] = "--upgrade"; - rpmCommandArray[2] = "--ignoresize"; - rpmCommandArray[3] = "--force"; - rpmCommandArray[4] = "-vh"; - rpmCommandArray[5] = databaseString; - rpmCommandArray[6] = databasePath; - rpmCommandArray[7] = packageName; - } - } else { - if ( relocations != null ) - { - rpmCommand = "rpm --upgrade --ignoresize --force -vh " + - "--relocate " + relocations + " " + packageName; - rpmCommandArray = new String[8]; - rpmCommandArray[0] = "rpm"; - rpmCommandArray[1] = "--upgrade"; - rpmCommandArray[2] = "--ignoresize"; - rpmCommandArray[3] = "--force"; - rpmCommandArray[4] = "-vh"; - rpmCommandArray[5] = "--relocate"; - rpmCommandArray[6] = relocations; - rpmCommandArray[7] = packageName; - } else { - rpmCommand = "rpm --upgrade --ignoresize --force -vh " + packageName; - rpmCommandArray = new String[6]; - rpmCommandArray[0] = "rpm"; - rpmCommandArray[1] = "--upgrade"; - rpmCommandArray[2] = "--ignoresize"; - rpmCommandArray[3] = "--force"; - rpmCommandArray[4] = "-vh"; - rpmCommandArray[5] = packageName; - } - } - } else { - if (useLocalDatabase) { - if ( relocations != null ) { - rpmCommand = "rpm --upgrade --ignoresize -vh " + - "--relocate " + relocations + " " + databaseString + - " " + databasePath + " " + packageName; - rpmCommandArray = new String[9]; - rpmCommandArray[0] = "rpm"; - rpmCommandArray[1] = "--upgrade"; - rpmCommandArray[2] = "--ignoresize"; - rpmCommandArray[3] = "-vh"; - rpmCommandArray[4] = "--relocate"; - rpmCommandArray[5] = relocations; - rpmCommandArray[6] = databaseString; - rpmCommandArray[7] = databasePath; - rpmCommandArray[8] = packageName; - } else { - rpmCommand = "rpm --upgrade --ignoresize -vh " + - databaseString + " " + databasePath + " " + packageName; - rpmCommandArray = new String[7]; - rpmCommandArray[0] = "rpm"; - rpmCommandArray[1] = "--upgrade"; - rpmCommandArray[2] = "--ignoresize"; - rpmCommandArray[3] = "-vh"; - rpmCommandArray[4] = databaseString; - rpmCommandArray[5] = databasePath; - rpmCommandArray[6] = packageName; - } - } else { - if ( relocations != null ) - { - rpmCommand = "rpm --upgrade --ignoresize -vh " + - "--relocate " + relocations + " " + packageName; - rpmCommandArray = new String[7]; - rpmCommandArray[0] = "rpm"; - rpmCommandArray[1] = "--upgrade"; - rpmCommandArray[2] = "--ignoresize"; - rpmCommandArray[3] = "-vh"; - rpmCommandArray[4] = "--relocate"; - rpmCommandArray[5] = relocations; - rpmCommandArray[6] = packageName; - } else { - rpmCommand = "rpm --upgrade --ignoresize -vh " + packageName; - rpmCommandArray = new String[5]; - rpmCommandArray[0] = "rpm"; - rpmCommandArray[1] = "--upgrade"; - rpmCommandArray[2] = "--ignoresize"; - rpmCommandArray[3] = "-vh"; - rpmCommandArray[4] = packageName; - } - } + // Defining a Vector that contains the full rpm command. Then the string array can be + // created dynamically. Otherwise there would be too many different scenarios. + + Vector rpmVector = new Vector(); + + rpmVector.add("rpm"); + rpmVector.add("--upgrade"); + rpmVector.add("--ignoresize"); + + if ( useForce ) { + rpmVector.add("--force"); } - + + if ( ! forceDebianString.equals("") ) { + rpmVector.add(forceDebianString); + } + + if ( ! nodepsString.equals("") ) { + rpmVector.add(nodepsString); + } + + rpmVector.add("-vh"); + + if ( relocations != null ) { + rpmVector.add("--relocate"); + rpmVector.add(relocations); + } + + if ( useLocalDatabase ) { + rpmVector.add(databaseString); + rpmVector.add(databasePath); + } + + rpmVector.add(packageName); + + // Creating String and StringArray for rpm command + + int capacity = rpmVector.size(); + + String rpmCommand = ""; + String[] rpmCommandArray = new String[capacity]; + + for (int i = 0; i < rpmVector.size(); i++) { + rpmCommandArray[i] = (String)rpmVector.get(i); + rpmCommand = rpmCommand + " " + (String)rpmVector.get(i); + } + + rpmCommand = rpmCommand.trim(); + + // Staring rpm process + Vector returnVector = new Vector(); Vector returnErrorVector = new Vector(); // int returnValue = SystemManager.executeProcessReturnVector(rpmCommand, returnVector, returnErrorVector); @@ -375,29 +335,70 @@ public class LinuxInstaller extends Installer { String databasePath = data.getDatabasePath(); String databaseString = ""; boolean useLocalDatabase = false; - String rpmCommand; - String[] rpmCommandArray; if (( databasePath != null ) && (! databasePath.equalsIgnoreCase("null"))) { databaseString = "--dbpath"; useLocalDatabase = true; } - - if (useLocalDatabase) { - rpmCommand = "rpm -ev" + " " + databaseString + " " + databasePath + " " + packageName; - rpmCommandArray = new String[5]; - rpmCommandArray[0] = "rpm"; - rpmCommandArray[1] = "-ev"; - rpmCommandArray[2] = databaseString; - rpmCommandArray[3] = databasePath; - rpmCommandArray[4] = packageName; - } else { - rpmCommand = "rpm -ev" + " " + packageName; - rpmCommandArray = new String[3]; - rpmCommandArray[0] = "rpm"; - rpmCommandArray[1] = "-ev"; - rpmCommandArray[2] = packageName; + + // On Debian based systems, rpms can be installed with the switch --force-debian, if a rpm + // is installed. + + String forceDebianString = ""; + String nodepsString = ""; + + if ( ! data.debianInvestigated() ) { + helper.investigateDebian(data); + data.setDebianInvestigated(true); + } + + if ( data.isDebianSystem() ) { + nodepsString = "--nodeps"; + + if ( data.useForceDebian() ) { + forceDebianString = "--force-debian"; + } + } + + // Defining a Vector that contains the full rpm command. Then the string array can be + // created dynamically. Otherwise there would be too many different scenarios. + + Vector rpmVector = new Vector(); + + rpmVector.add("rpm"); + + if ( ! forceDebianString.equals("") ) { + rpmVector.add(forceDebianString); + } + + if ( ! nodepsString.equals("") ) { + rpmVector.add(nodepsString); + } + + rpmVector.add("-ev"); + + if ( useLocalDatabase ) { + rpmVector.add(databaseString); + rpmVector.add(databasePath); + } + + rpmVector.add(packageName); + + // Creating String and StringArray for rpm command + + int capacity = rpmVector.size(); + + String rpmCommand = ""; + String[] rpmCommandArray = new String[capacity]; + + for (int i = 0; i < rpmVector.size(); i++) { + rpmCommandArray[i] = (String)rpmVector.get(i); + rpmCommand = rpmCommand + " " + (String)rpmVector.get(i); } + + rpmCommand = rpmCommand.trim(); + + // Starting rpm process Vector returnVector = new Vector(); Vector returnErrorVector = new Vector(); diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java index 1ce882713..fb8bfa96a 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java @@ -380,6 +380,39 @@ import java.util.Vector;public class LinuxHelper { databasePath = databaseFile.getPath(); return databasePath; } + + public void investigateDebian(InstallData data) { + + // First check: Is this a Debian system? + + String dpkgFile = "/usr/bin/dpkg"; + + if ( new File(dpkgFile).exists() ) { + + data.setIsDebianSystem(true); + + // Second check: If this is a Debian system, is "--force-debian" required? Older + // versions do not support "--force-debian". + + // String rpmQuery = "rpm --help; + String[] rpmQueryArray = new String[2]; + rpmQueryArray[0] = "rpm"; + rpmQueryArray[1] = "--help"; + + Vector returnVector = new Vector(); + Vector returnErrorVector = new Vector(); + int returnValue = ExecuteProcess.executeProcessReturnVector(rpmQueryArray, returnVector, returnErrorVector); + + // Checking if the return vector contains the string "force-debian" + + for (int i = 0; i < returnVector.size(); i++) { + String line = (String) returnVector.get(i); + if ( line.indexOf("force-debian") > -1 ) { + data.setUseForceDebian(true); + } + } + } + } public void getLinuxFileInfo(PackageDescription packageData) { // analyzing a string like "openoffice-core01-2.0.3-159" as "name-version-release" diff --git a/lingucomponent/prj/build.lst b/lingucomponent/prj/build.lst index 045aaee82..15ee595c6 100644 --- a/lingucomponent/prj/build.lst +++ b/lingucomponent/prj/build.lst @@ -1,4 +1,4 @@ -lc lingucomponent : linguistic libtextcat svl HYPHEN:hyphen HUNSPELL:hunspell MYTHES:mythes NULL +lc lingucomponent : linguistic LIBTEXTCAT:libtextcat LIBTEXTCATDATA:libtextcat svl HYPHEN:hyphen HUNSPELL:hunspell MYTHES:mythes NULL lc lingucomponent usr1 - all lc_mkout NULL lc lingucomponent\inc nmake - all lc_inc NULL lc lingucomponent\source\lingutil nmake - all lc_util lc_inc NULL diff --git a/lingucomponent/prj/d.lst b/lingucomponent/prj/d.lst index 666ee38d5..4760a299c 100644 --- a/lingucomponent/prj/d.lst +++ b/lingucomponent/prj/d.lst @@ -46,3 +46,8 @@ mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office ..\config\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\*.xcu +..\%__SRC%\misc\MacOSXSpell.component %_DEST%\xml%_EXT%\MacOSXSpell.component +..\%__SRC%\misc\guesslang.component %_DEST%\xml%_EXT%\guesslang.component +..\%__SRC%\misc\hyphen.component %_DEST%\xml%_EXT%\hyphen.component +..\%__SRC%\misc\lnth.component %_DEST%\xml%_EXT%\lnth.component +..\%__SRC%\misc\spell.component %_DEST%\xml%_EXT%\spell.component diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp index b0f85bf7b..a9861e3ff 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp @@ -1,3 +1,2 @@ component_getFactory component_getImplementationEnvironment -component_writeInfo diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx index defbec837..8ccf152d7 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx @@ -42,9 +42,6 @@ using namespace com::sun::star::registry; // declaration of external RegEntry-functions defined by the service objects // -extern sal_Bool SAL_CALL Hyphenator_writeInfo( - void * /*pServiceManager*/, XRegistryKey * pRegistryKey ); - extern void * SAL_CALL Hyphenator_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, @@ -57,12 +54,6 @@ extern void * SAL_CALL Hyphenator_getFactory( extern "C" { -sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, XRegistryKey * pRegistryKey ) -{ - return Hyphenator_writeInfo( pServiceManager, pRegistryKey ); -} - void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component new file mode 100644 index 000000000..aeae4c577 --- /dev/null +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="org.openoffice.lingu.LibHnjHyphenator"> + <service name="com.sun.star.linguistic2.Hyphenator"/> + </implementation> +</component> diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx index 2cdd99740..7f79def24 100644..100755 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp> -//#include <com/sun/star/linguistic2/SpellFailure.hpp> #include <cppuhelper/factory.hxx> // helper for factories #include <com/sun/star/registry/XRegistryKey.hpp> #include <i18npool/mslangid.hxx> @@ -43,15 +42,12 @@ #include <osl/mutex.hxx> #include <hyphen.h> - -#ifndef _HYPHENIMP_HXX #include <hyphenimp.hxx> -#endif #include <linguistic/hyphdta.hxx> #include <rtl/ustring.hxx> - #include <rtl/ustrbuf.hxx> +#include <rtl/textenc.h> #include <linguistic/lngprops.hxx> #include <unotools/pathoptions.hxx> @@ -97,9 +93,8 @@ Hyphenator::Hyphenator() : { bDisposing = FALSE; pPropHelper = NULL; - aDicts = NULL; - numdict = 0; - + aDicts = NULL; + numdict = 0; } @@ -108,21 +103,22 @@ Hyphenator::~Hyphenator() if (pPropHelper) pPropHelper->RemoveAsPropListener(); - if ((numdict) && (aDicts)) { - for (int i=0; i < numdict; i++) { + if ((numdict) && (aDicts)) + { + for (int i=0; i < numdict; i++) + { if (aDicts[i].apCC) delete aDicts[i].apCC; aDicts[i].apCC = NULL; - } + } } - if (aDicts) delete[] aDicts; + if (aDicts) delete[] aDicts; aDicts = NULL; - numdict = 0; + numdict = 0; } PropertyHelper_Hyphen & Hyphenator::GetPropHelper_Impl() { - if (!pPropHelper) { Reference< XPropertySet > xPropSet( GetLinguProperties(), UNO_QUERY ); @@ -212,12 +208,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales() // add dictionary information aDicts = new HDInfo[numdict]; -/* - aTEncs = new rtl_TextEncoding [numdict]; - aTLocs = new Locale [numdict]; - aTNames = new OUString [numdict]; - aCharSetInfo = new CharClass* [numdict]; -*/ + k = 0; for (aDictIt = aDics.begin(); aDictIt != aDics.end(); ++aDictIt) { @@ -233,7 +224,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales() for (sal_Int32 i = 0; i < nLocales; ++i) { aDicts[k].aPtr = NULL; - aDicts[k].aEnc = 0; + aDicts[k].eEnc = RTL_TEXTENCODING_DONTKNOW; aDicts[k].aLoc = MsLangId::convertLanguageToLocale( MsLangId::convertIsoStringToLanguage( aDictIt->aLocaleNames[i] )); aDicts[k].apCC = new CharClass( aDicts[k].aLoc ); @@ -288,240 +279,268 @@ sal_Bool SAL_CALL Hyphenator::hasLocale(const Locale& rLocale) } -Reference< XHyphenatedWord > SAL_CALL -Hyphenator::hyphenate( const ::rtl::OUString& aWord, - const ::com::sun::star::lang::Locale& aLocale, - sal_Int16 nMaxLeading, - const ::com::sun::star::beans::PropertyValues& aProperties ) - throw (com::sun::star::uno::RuntimeException, - com::sun::star::lang::IllegalArgumentException) +Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const ::rtl::OUString& aWord, + const ::com::sun::star::lang::Locale& aLocale, + sal_Int16 nMaxLeading, + const ::com::sun::star::beans::PropertyValues& aProperties ) + throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException) { int nHyphenationPos = -1; - int nHyphenationPosAlt = -1; - int nHyphenationPosAltHyph = -1; + int nHyphenationPosAlt = -1; + int nHyphenationPosAltHyph = -1; int wordlen; char *hyphens; - char *lcword; - int k = 0; + char *lcword; + int k = 0; - PropertyHelper_Hyphen & rHelper = GetPropHelper(); - rHelper.SetTmpPropVals(aProperties); + PropertyHelper_Hyphen & rHelper = GetPropHelper(); + rHelper.SetTmpPropVals(aProperties); sal_Int16 minTrail = rHelper.GetMinTrailing(); sal_Int16 minLead = rHelper.GetMinLeading(); sal_Int16 minLen = rHelper.GetMinWordLength(); HyphenDict *dict = NULL; - rtl_TextEncoding aEnc = 0; - CharClass * pCC = NULL; + rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW; + CharClass * pCC = NULL; Reference< XHyphenatedWord > xRes; - k = -1; - for (int j = 0; j < numdict; j++) - if (aLocale == aDicts[j].aLoc) k = j; - - - // if we have a hyphenation dictionary matching this locale - if (k != -1) { + k = -1; + for (int j = 0; j < numdict; j++) + { + if (aLocale == aDicts[j].aLoc) + k = j; + } + // if we have a hyphenation dictionary matching this locale + if (k != -1) + { // if this dictinary has not been loaded yet do that - if (!aDicts[k].aPtr) { - - OUString DictFN = aDicts[k].aName + A2OU(".dic"); - OUString dictpath; + if (!aDicts[k].aPtr) + { + OUString DictFN = aDicts[k].aName + A2OU(".dic"); + OUString dictpath; - osl::FileBase::getSystemPathFromFileURL( DictFN, dictpath ); - OString sTmp( OU2ENC( dictpath, osl_getThreadTextEncoding() ) ); + osl::FileBase::getSystemPathFromFileURL( DictFN, dictpath ); + OString sTmp( OU2ENC( dictpath, osl_getThreadTextEncoding() ) ); #if defined(WNT) - // workaround for Windows specifc problem that the - // path length in calls to 'fopen' is limted to somewhat - // about 120+ characters which will usually be exceed when - // using dictionaries as extensions. - sTmp = Win_GetShortPathName( dictpath ); + // workaround for Windows specifc problem that the + // path length in calls to 'fopen' is limted to somewhat + // about 120+ characters which will usually be exceed when + // using dictionaries as extensions. + sTmp = Win_GetShortPathName( dictpath ); #endif - if ( ( dict = hnj_hyphen_load ( sTmp.getStr()) ) == NULL ) - { - fprintf(stderr, "Couldn't find file %s\n", OU2ENC(dictpath, osl_getThreadTextEncoding()) ); - return NULL; - } - aDicts[k].aPtr = dict; - aDicts[k].aEnc = rtl_getTextEncodingFromUnixCharset(dict->cset); - if (aDicts[k].aEnc == RTL_TEXTENCODING_DONTKNOW) { - if (strcmp("ISCII-DEVANAGARI", dict->cset) == 0) { - aDicts[k].aEnc = RTL_TEXTENCODING_ISCII_DEVANAGARI; - } else if (strcmp("UTF-8", dict->cset) == 0) { - aDicts[k].aEnc = RTL_TEXTENCODING_UTF8; - } - } + if ( ( dict = hnj_hyphen_load ( sTmp.getStr()) ) == NULL ) + { + fprintf(stderr, "Couldn't find file %s\n", OU2ENC(dictpath, osl_getThreadTextEncoding()) ); + return NULL; + } + aDicts[k].aPtr = dict; + aDicts[k].eEnc = getTextEncodingFromCharset(dict->cset); } - // other wise hyphenate the word with that dictionary - dict = aDicts[k].aPtr; - aEnc = aDicts[k].aEnc; - pCC = aDicts[k].apCC; + // other wise hyphenate the word with that dictionary + dict = aDicts[k].aPtr; + eEnc = aDicts[k].eEnc; + pCC = aDicts[k].apCC; - sal_uInt16 ct = CAPTYPE_UNKNOWN; - ct = capitalType(aWord, pCC); + // we don't want to work with a default text encoding since following incorrect + // results may occur only for specific text and thus may be hard to notice. + // Thus better always make a clean exit here if the text encoding is in question. + // Hopefully something not working at all will raise proper attention quickly. ;-) + DBG_ASSERT( eEnc != RTL_TEXTENCODING_DONTKNOW, "failed to get text encoding! (maybe incorrect encoding string in file)" ); + if (eEnc == RTL_TEXTENCODING_DONTKNOW) + return NULL; - // first convert any smart quotes or apostrophes to normal ones + sal_uInt16 ct = CAPTYPE_UNKNOWN; + ct = capitalType(aWord, pCC); + + // first convert any smart quotes or apostrophes to normal ones OUStringBuffer rBuf(aWord); - sal_Int32 nc = rBuf.getLength(); - sal_Unicode ch; - for (sal_Int32 ix=0; ix < nc; ix++) { + sal_Int32 nc = rBuf.getLength(); + sal_Unicode ch; + for (sal_Int32 ix=0; ix < nc; ix++) + { ch = rBuf.charAt(ix); - if ((ch == 0x201C) || (ch == 0x201D)) rBuf.setCharAt(ix,(sal_Unicode)0x0022); - if ((ch == 0x2018) || (ch == 0x2019)) rBuf.setCharAt(ix,(sal_Unicode)0x0027); - } - OUString nWord(rBuf.makeStringAndClear()); + if ((ch == 0x201C) || (ch == 0x201D)) + rBuf.setCharAt(ix,(sal_Unicode)0x0022); + if ((ch == 0x2018) || (ch == 0x2019)) + rBuf.setCharAt(ix,(sal_Unicode)0x0027); + } + OUString nWord(rBuf.makeStringAndClear()); - // now convert word to all lowercase for pattern recognition - OUString nTerm(makeLowerCase(nWord, pCC)); + // now convert word to all lowercase for pattern recognition + OUString nTerm(makeLowerCase(nWord, pCC)); - // now convert word to needed encoding - OString encWord(OU2ENC(nTerm,aEnc)); + // now convert word to needed encoding + OString encWord(OU2ENC(nTerm,eEnc)); wordlen = encWord.getLength(); - lcword = new char[wordlen + 1]; + lcword = new char[wordlen + 1]; hyphens = new char[wordlen + 5]; - char ** rep = NULL; // replacements of discretionary hyphenation - int * pos = NULL; // array of [hyphenation point] minus [deletion position] - int * cut = NULL; // length of deletions in original word - - // copy converted word into simple char buffer - strcpy(lcword,encWord.getStr()); - - // now strip off any ending periods - int n = wordlen-1; - while((n >=0) && (lcword[n] == '.')) n--; - n++; - if (n > 0) { - if (hnj_hyphen_hyphenate3(dict, lcword, n, hyphens, NULL, &rep, &pos, &cut, - minLead, minTrail, Max(dict->clhmin, Max(dict->clhmin, 2) + Max(0, minLead - Max(dict->lhmin, 2))), - Max(dict->crhmin, Max(dict->crhmin, 2) + Max(0, minTrail - Max(dict->rhmin, 2))))) - { - //whoops something did not work - delete[] hyphens; - delete[] lcword; - if (rep) { - for(int j = 0; j < n; j++) { + char ** rep = NULL; // replacements of discretionary hyphenation + int * pos = NULL; // array of [hyphenation point] minus [deletion position] + int * cut = NULL; // length of deletions in original word + + // copy converted word into simple char buffer + strcpy(lcword,encWord.getStr()); + + // now strip off any ending periods + int n = wordlen-1; + while((n >=0) && (lcword[n] == '.')) + n--; + n++; + if (n > 0) + { + const bool bFailed = 0 != hnj_hyphen_hyphenate3( dict, lcword, n, hyphens, NULL, + &rep, &pos, &cut, minLead, minTrail, + Max(dict->clhmin, Max(dict->clhmin, 2) + Max(0, minLead - Max(dict->lhmin, 2))), + Max(dict->crhmin, Max(dict->crhmin, 2) + Max(0, minTrail - Max(dict->rhmin, 2))) ); + if (bFailed) + { + //whoops something did not work + delete[] hyphens; + delete[] lcword; + if (rep) + { + for(int j = 0; j < n; j++) + { if (rep[j]) free(rep[j]); } free(rep); - } - if (pos) free(pos); - if (cut) free(cut); - return NULL; - } + } + if (pos) free(pos); + if (cut) free(cut); + return NULL; } + } - // now backfill hyphens[] for any removed trailing periods - for (int c = n; c < wordlen; c++) hyphens[c] = '0'; - hyphens[wordlen] = '\0'; + // now backfill hyphens[] for any removed trailing periods + for (int c = n; c < wordlen; c++) hyphens[c] = '0'; + hyphens[wordlen] = '\0'; INT32 Leading = GetPosInWordToCheck( aWord, nMaxLeading ); for (INT32 i = 0; i < n; i++) { - int leftrep = 0; - BOOL hit = (n >= minLen); - if (!rep || !rep[i] || (i >= n)) { - hit = hit && (hyphens[i]&1) && (i < Leading); - hit = hit && (i >= (minLead-1) ); - hit = hit && ((n - i - 1) >= minTrail); - } else { - // calculate change character length before hyphenation point signed with '=' - for (char * c = rep[i]; *c && (*c != '='); c++) { - if (aEnc == RTL_TEXTENCODING_UTF8) { - if (((unsigned char) *c) >> 6 != 2) leftrep++; - } else leftrep++; - } - hit = hit && (hyphens[i]&1) && ((i + leftrep - pos[i]) < Leading); - hit = hit && ((i + leftrep - pos[i]) >= (minLead-1) ); - hit = hit && ((n - i - 1 + sal::static_int_cast< sal_sSize >(strlen(rep[i])) - leftrep - 1) >= minTrail); + int leftrep = 0; + BOOL hit = (n >= minLen); + if (!rep || !rep[i] || (i >= n)) + { + hit = hit && (hyphens[i]&1) && (i < Leading); + hit = hit && (i >= (minLead-1) ); + hit = hit && ((n - i - 1) >= minTrail); + } + else + { + // calculate change character length before hyphenation point signed with '=' + for (char * c = rep[i]; *c && (*c != '='); c++) + { + if (eEnc == RTL_TEXTENCODING_UTF8) + { + if (((unsigned char) *c) >> 6 != 2) + leftrep++; + } + else + leftrep++; } - if (hit) { - nHyphenationPos = i; - if (rep && (i < n) && rep[i]) { - nHyphenationPosAlt = i - pos[i]; - nHyphenationPosAltHyph = i + leftrep - pos[i]; - } + hit = hit && (hyphens[i]&1) && ((i + leftrep - pos[i]) < Leading); + hit = hit && ((i + leftrep - pos[i]) >= (minLead-1) ); + hit = hit && ((n - i - 1 + sal::static_int_cast< sal_sSize >(strlen(rep[i])) - leftrep - 1) >= minTrail); + } + if (hit) + { + nHyphenationPos = i; + if (rep && (i < n) && rep[i]) + { + nHyphenationPosAlt = i - pos[i]; + nHyphenationPosAltHyph = i + leftrep - pos[i]; } - } - - if (nHyphenationPos == -1) { - xRes = NULL; - } else { - if (rep && rep[nHyphenationPos]) { - // remove equal sign - char * s = rep[nHyphenationPos]; - int eq = 0; - for (; *s; s++) { - if (*s == '=') eq = 1; - if (eq) *s = *(s + 1); - } - OUString repHyphlow(rep[nHyphenationPos], strlen(rep[nHyphenationPos]), aEnc); - OUString repHyph; - switch (ct) { - case CAPTYPE_ALLCAP: - { - repHyph = makeUpperCase(repHyphlow, pCC); - break; - } - case CAPTYPE_INITCAP: - { - if (nHyphenationPosAlt == 0) { - repHyph = makeInitCap(repHyphlow, pCC); - } else { - repHyph = repHyphlow; - } - break; - } - default: - { - repHyph = repHyphlow; - break; - } } + } - // handle shortening - INT16 nPos = (INT16) ((nHyphenationPosAltHyph < nHyphenationPos) ? - nHyphenationPosAltHyph : nHyphenationPos); - // dicretionary hyphenation + if (nHyphenationPos == -1) + { + xRes = NULL; + } + else + { + if (rep && rep[nHyphenationPos]) + { + // remove equal sign + char * s = rep[nHyphenationPos]; + int eq = 0; + for (; *s; s++) + { + if (*s == '=') eq = 1; + if (eq) *s = *(s + 1); + } + OUString repHyphlow(rep[nHyphenationPos], strlen(rep[nHyphenationPos]), eEnc); + OUString repHyph; + switch (ct) + { + case CAPTYPE_ALLCAP: + { + repHyph = makeUpperCase(repHyphlow, pCC); + break; + } + case CAPTYPE_INITCAP: + { + if (nHyphenationPosAlt == 0) + repHyph = makeInitCap(repHyphlow, pCC); + else + repHyph = repHyphlow; + break; + } + default: + { + repHyph = repHyphlow; + break; + } + } + + // handle shortening + INT16 nPos = (INT16) ((nHyphenationPosAltHyph < nHyphenationPos) ? + nHyphenationPosAltHyph : nHyphenationPos); + // dicretionary hyphenation xRes = new HyphenatedWord( aWord, LocaleToLanguage( aLocale ), nPos, - aWord.replaceAt(nHyphenationPosAlt + 1, cut[nHyphenationPos], repHyph), - (INT16) nHyphenationPosAltHyph); - } else { + aWord.replaceAt(nHyphenationPosAlt + 1, cut[nHyphenationPos], repHyph), + (INT16) nHyphenationPosAltHyph); + } + else + { xRes = new HyphenatedWord( aWord, LocaleToLanguage( aLocale ), - (INT16)nHyphenationPos, aWord, (INT16) nHyphenationPos); - } + (INT16)nHyphenationPos, aWord, (INT16) nHyphenationPos); + } } - delete[] lcword; + delete[] lcword; delete[] hyphens; - if (rep) { - for(int j = 0; j < n; j++) { - if (rep[j]) free(rep[j]); - } - free(rep); + if (rep) + { + for(int j = 0; j < n; j++) + { + if (rep[j]) free(rep[j]); } - if (pos) free(pos); - if (cut) free(cut); + free(rep); + } + if (pos) free(pos); + if (cut) free(cut); return xRes; } - return NULL; + return NULL; } -Reference < XHyphenatedWord > SAL_CALL - Hyphenator::queryAlternativeSpelling( const ::rtl::OUString& /*aWord*/, - const ::com::sun::star::lang::Locale& /*aLocale*/, - sal_Int16 /*nIndex*/, - const ::com::sun::star::beans::PropertyValues& /*aProperties*/ ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) +Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling( + const ::rtl::OUString& /*aWord*/, + const ::com::sun::star::lang::Locale& /*aLocale*/, + sal_Int16 /*nIndex*/, + const ::com::sun::star::beans::PropertyValues& /*aProperties*/ ) + throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { /* alternative spelling isn't supported by tex dictionaries */ /* XXX: OOo's extended libhjn algorithm can support alternative spellings with extended TeX dic. */ @@ -529,251 +548,262 @@ Reference < XHyphenatedWord > SAL_CALL return NULL; } -Reference< XPossibleHyphens > SAL_CALL - Hyphenator::createPossibleHyphens( const ::rtl::OUString& aWord, - const ::com::sun::star::lang::Locale& aLocale, - const ::com::sun::star::beans::PropertyValues& aProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) - +Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const ::rtl::OUString& aWord, + const ::com::sun::star::lang::Locale& aLocale, + const ::com::sun::star::beans::PropertyValues& aProperties ) + throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - int wordlen; - char *hyphens; - char *lcword; - int k; + int wordlen; + char *hyphens; + char *lcword; + int k; - PropertyHelper_Hyphen & rHelper = GetPropHelper(); - rHelper.SetTmpPropVals(aProperties); - sal_Int16 minTrail = rHelper.GetMinTrailing(); - sal_Int16 minLead = rHelper.GetMinLeading(); + PropertyHelper_Hyphen & rHelper = GetPropHelper(); + rHelper.SetTmpPropVals(aProperties); + sal_Int16 minTrail = rHelper.GetMinTrailing(); + sal_Int16 minLead = rHelper.GetMinLeading(); - HyphenDict *dict = NULL; - rtl_TextEncoding aEnc = 0; - CharClass* pCC = NULL; + HyphenDict *dict = NULL; + rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW; + CharClass* pCC = NULL; - Reference< XPossibleHyphens > xRes; + Reference< XPossibleHyphens > xRes; - k = -1; - for (int j = 0; j < numdict; j++) - if (aLocale == aDicts[j].aLoc) k = j; + k = -1; + for (int j = 0; j < numdict; j++) + { + if (aLocale == aDicts[j].aLoc) k = j; + } + // if we have a hyphenation dictionary matching this locale + if (k != -1) + { + // if this dictioanry has not been loaded yet do that + if (!aDicts[k].aPtr) + { + OUString DictFN = aDicts[k].aName + A2OU(".dic"); + OUString dictpath; - // if we have a hyphenation dictionary matching this locale - if (k != -1) { + osl::FileBase::getSystemPathFromFileURL( DictFN, dictpath ); + OString sTmp( OU2ENC( dictpath, osl_getThreadTextEncoding() ) ); - // if this dictioanry has not been loaded yet do that - if (!aDicts[k].aPtr) { +#if defined(WNT) + // workaround for Windows specifc problem that the + // path length in calls to 'fopen' is limted to somewhat + // about 120+ characters which will usually be exceed when + // using dictionaries as extensions. + sTmp = Win_GetShortPathName( dictpath ); +#endif - OUString DictFN = aDicts[k].aName + A2OU(".dic"); - OUString dictpath; + if ( ( dict = hnj_hyphen_load ( sTmp.getStr()) ) == NULL ) + { + fprintf(stderr, "Couldn't find file %s and %s\n", sTmp.getStr(), OU2ENC(dictpath, osl_getThreadTextEncoding()) ); + return NULL; + } + aDicts[k].aPtr = dict; + aDicts[k].eEnc = getTextEncodingFromCharset(dict->cset); + } - osl::FileBase::getSystemPathFromFileURL( DictFN, dictpath ); - OString sTmp( OU2ENC( dictpath, osl_getThreadTextEncoding() ) ); + // other wise hyphenate the word with that dictionary + dict = aDicts[k].aPtr; + eEnc = aDicts[k].eEnc; + pCC = aDicts[k].apCC; -#if defined(WNT) - // workaround for Windows specifc problem that the - // path length in calls to 'fopen' is limted to somewhat - // about 120+ characters which will usually be exceed when - // using dictionaries as extensions. - sTmp = Win_GetShortPathName( dictpath ); -#endif + // we don't want to work with a default text encoding since following incorrect + // results may occur only for specific text and thus may be hard to notice. + // Thus better always make a clean exit here if the text encoding is in question. + // Hopefully something not working at all will raise proper attention quickly. ;-) + DBG_ASSERT( eEnc != RTL_TEXTENCODING_DONTKNOW, "failed to get text encoding! (maybe incorrect encoding string in file)" ); + if (eEnc == RTL_TEXTENCODING_DONTKNOW) + return NULL; - if ( ( dict = hnj_hyphen_load ( sTmp.getStr()) ) == NULL ) + // first handle smart quotes both single and double + OUStringBuffer rBuf(aWord); + sal_Int32 nc = rBuf.getLength(); + sal_Unicode ch; + for (sal_Int32 ix=0; ix < nc; ix++) { - fprintf(stderr, "Couldn't find file %s and %s\n", sTmp.getStr(), OU2ENC(dictpath, osl_getThreadTextEncoding()) ); - return NULL; + ch = rBuf.charAt(ix); + if ((ch == 0x201C) || (ch == 0x201D)) + rBuf.setCharAt(ix,(sal_Unicode)0x0022); + if ((ch == 0x2018) || (ch == 0x2019)) + rBuf.setCharAt(ix,(sal_Unicode)0x0027); } - aDicts[k].aPtr = dict; - aDicts[k].aEnc = rtl_getTextEncodingFromUnixCharset(dict->cset); - if (aDicts[k].aEnc == RTL_TEXTENCODING_DONTKNOW) { - if (strcmp("ISCII-DEVANAGARI", dict->cset) == 0) { - aDicts[k].aEnc = RTL_TEXTENCODING_ISCII_DEVANAGARI; - } else if (strcmp("UTF-8", dict->cset) == 0) { - aDicts[k].aEnc = RTL_TEXTENCODING_UTF8; + OUString nWord(rBuf.makeStringAndClear()); + + // now convert word to all lowercase for pattern recognition + OUString nTerm(makeLowerCase(nWord, pCC)); + + // now convert word to needed encoding + OString encWord(OU2ENC(nTerm,eEnc)); + + wordlen = encWord.getLength(); + lcword = new char[wordlen+1]; + hyphens = new char[wordlen+5]; + char ** rep = NULL; // replacements of discretionary hyphenation + int * pos = NULL; // array of [hyphenation point] minus [deletion position] + int * cut = NULL; // length of deletions in original word + + // copy converted word into simple char buffer + strcpy(lcword,encWord.getStr()); + + // first remove any trailing periods + int n = wordlen-1; + while((n >=0) && (lcword[n] == '.')) + n--; + n++; + // fprintf(stderr,"hyphenate... %s\n",lcword); fflush(stderr); + if (n > 0) + { + const bool bFailed = 0 != hnj_hyphen_hyphenate3(dict, lcword, n, hyphens, NULL, + &rep, &pos, &cut, minLead, minTrail, + Max(dict->clhmin, Max(dict->clhmin, 2) + Max(0, minLead - Max(dict->lhmin, 2))), + Max(dict->crhmin, Max(dict->crhmin, 2) + Max(0, minTrail - Max(dict->rhmin, 2))) ); + if (bFailed) + { + delete[] hyphens; + delete[] lcword; + + if (rep) + { + for(int j = 0; j < n; j++) + { + if (rep[j]) free(rep[j]); + } + free(rep); + } + if (pos) free(pos); + if (cut) free(cut); + + return NULL; } - } - } - - // other wise hyphenate the word with that dictionary - dict = aDicts[k].aPtr; - aEnc = aDicts[k].aEnc; - pCC = aDicts[k].apCC; - - // first handle smart quotes both single and double - OUStringBuffer rBuf(aWord); - sal_Int32 nc = rBuf.getLength(); - sal_Unicode ch; - for (sal_Int32 ix=0; ix < nc; ix++) { - ch = rBuf.charAt(ix); - if ((ch == 0x201C) || (ch == 0x201D)) rBuf.setCharAt(ix,(sal_Unicode)0x0022); - if ((ch == 0x2018) || (ch == 0x2019)) rBuf.setCharAt(ix,(sal_Unicode)0x0027); - } - OUString nWord(rBuf.makeStringAndClear()); - - // now convert word to all lowercase for pattern recognition - OUString nTerm(makeLowerCase(nWord, pCC)); - - // now convert word to needed encoding - OString encWord(OU2ENC(nTerm,aEnc)); - - wordlen = encWord.getLength(); - lcword = new char[wordlen+1]; - hyphens = new char[wordlen+5]; - char ** rep = NULL; // replacements of discretionary hyphenation - int * pos = NULL; // array of [hyphenation point] minus [deletion position] - int * cut = NULL; // length of deletions in original word - - // copy converted word into simple char buffer - strcpy(lcword,encWord.getStr()); - - // first remove any trailing periods - int n = wordlen-1; - while((n >=0) && (lcword[n] == '.')) n--; - n++; - // fprintf(stderr,"hyphenate... %s\n",lcword); fflush(stderr); - if (n > 0) { - if (hnj_hyphen_hyphenate3(dict, lcword, n, hyphens, NULL, &rep, &pos, &cut, - minLead, minTrail, Max(dict->clhmin, Max(dict->clhmin, 2) + Max(0, minLead - Max(dict->lhmin, 2))), - Max(dict->crhmin, Max(dict->crhmin, 2) + Max(0, minTrail - Max(dict->rhmin, 2))))) - { - delete[] hyphens; - delete[] lcword; - - if (rep) { - for(int j = 0; j < n; j++) { - if (rep[j]) free(rep[j]); - } - free(rep); - } - if (pos) free(pos); - if (cut) free(cut); - - return NULL; - } - } - // now backfill hyphens[] for any removed periods - for (int c = n; c < wordlen; c++) hyphens[c] = '0'; - hyphens[wordlen] = '\0'; - // fprintf(stderr,"... %s\n",hyphens); fflush(stderr); - - INT16 nHyphCount = 0; - INT16 i; - - for ( i = 0; i < encWord.getLength(); i++) - if (hyphens[i]&1 && (!rep || !rep[i])) - nHyphCount++; - - Sequence< INT16 > aHyphPos(nHyphCount); - INT16 *pPos = aHyphPos.getArray(); - OUStringBuffer hyphenatedWordBuffer; - OUString hyphenatedWord; - nHyphCount = 0; - - for (i = 0; i < nWord.getLength(); i++) { - hyphenatedWordBuffer.append(aWord[i]); - // hyphenation position (not alternative) - if (hyphens[i]&1 && (!rep || !rep[i])) { - pPos[nHyphCount] = i; - hyphenatedWordBuffer.append(sal_Unicode('=')); - nHyphCount++; - } - } - - hyphenatedWord = hyphenatedWordBuffer.makeStringAndClear(); - //fprintf(stderr,"result is %s\n",OU2A(hyphenatedWord)); - //fflush(stderr); - - xRes = new PossibleHyphens( aWord, LocaleToLanguage( aLocale ), - hyphenatedWord, aHyphPos ); - - delete[] hyphens; - delete[] lcword; - - if (rep) { - for(int j = 0; j < n; j++) { - if (rep[j]) free(rep[j]); - } - free(rep); - } - if (pos) free(pos); - if (cut) free(cut); - - return xRes; - } + } + // now backfill hyphens[] for any removed periods + for (int c = n; c < wordlen; c++) + hyphens[c] = '0'; + hyphens[wordlen] = '\0'; + // fprintf(stderr,"... %s\n",hyphens); fflush(stderr); - return NULL; + INT16 nHyphCount = 0; + INT16 i; + + for ( i = 0; i < encWord.getLength(); i++) + { + if (hyphens[i]&1 && (!rep || !rep[i])) + nHyphCount++; + } + + Sequence< INT16 > aHyphPos(nHyphCount); + INT16 *pPos = aHyphPos.getArray(); + OUStringBuffer hyphenatedWordBuffer; + OUString hyphenatedWord; + nHyphCount = 0; + + for (i = 0; i < nWord.getLength(); i++) + { + hyphenatedWordBuffer.append(aWord[i]); + // hyphenation position (not alternative) + if (hyphens[i]&1 && (!rep || !rep[i])) + { + pPos[nHyphCount] = i; + hyphenatedWordBuffer.append(sal_Unicode('=')); + nHyphCount++; + } + } + + hyphenatedWord = hyphenatedWordBuffer.makeStringAndClear(); + //fprintf(stderr,"result is %s\n",OU2A(hyphenatedWord)); + //fflush(stderr); + + xRes = new PossibleHyphens( aWord, LocaleToLanguage( aLocale ), + hyphenatedWord, aHyphPos ); + + delete[] hyphens; + delete[] lcword; + + if (rep) + { + for(int j = 0; j < n; j++) + { + if (rep[j]) free(rep[j]); + } + free(rep); + } + if (pos) free(pos); + if (cut) free(cut); + return xRes; + } + + return NULL; } sal_uInt16 SAL_CALL Hyphenator::capitalType(const OUString& aTerm, CharClass * pCC) { - sal_Int32 tlen = aTerm.getLength(); - if ((pCC) && (tlen)) { - String aStr(aTerm); - sal_Int32 nc = 0; - for (xub_StrLen tindex = 0; tindex < tlen; tindex++) { - if (pCC->getCharacterType(aStr,tindex) & - ::com::sun::star::i18n::KCharacterType::UPPER) nc++; - } - - if (nc == 0) return (sal_uInt16) CAPTYPE_NOCAP; - - if (nc == tlen) return (sal_uInt16) CAPTYPE_ALLCAP; + sal_Int32 tlen = aTerm.getLength(); + if ((pCC) && (tlen)) + { + String aStr(aTerm); + sal_Int32 nc = 0; + for (xub_StrLen tindex = 0; tindex < tlen; tindex++) + { + if (pCC->getCharacterType(aStr,tindex) & ::com::sun::star::i18n::KCharacterType::UPPER) + nc++; + } - if ((nc == 1) && (pCC->getCharacterType(aStr,0) & - ::com::sun::star::i18n::KCharacterType::UPPER)) - return (sal_uInt16) CAPTYPE_INITCAP; + if (nc == 0) + return (sal_uInt16) CAPTYPE_NOCAP; + if (nc == tlen) + return (sal_uInt16) CAPTYPE_ALLCAP; + if ((nc == 1) && (pCC->getCharacterType(aStr,0) & ::com::sun::star::i18n::KCharacterType::UPPER)) + return (sal_uInt16) CAPTYPE_INITCAP; - return (sal_uInt16) CAPTYPE_MIXED; + return (sal_uInt16) CAPTYPE_MIXED; } - return (sal_uInt16) CAPTYPE_UNKNOWN; + return (sal_uInt16) CAPTYPE_UNKNOWN; } OUString SAL_CALL Hyphenator::makeLowerCase(const OUString& aTerm, CharClass * pCC) { - if (pCC) - return pCC->toLower_rtl(aTerm, 0, aTerm.getLength()); - return aTerm; + if (pCC) + return pCC->toLower_rtl(aTerm, 0, aTerm.getLength()); + return aTerm; } OUString SAL_CALL Hyphenator::makeUpperCase(const OUString& aTerm, CharClass * pCC) { - if (pCC) - return pCC->toUpper_rtl(aTerm, 0, aTerm.getLength()); - return aTerm; + if (pCC) + return pCC->toUpper_rtl(aTerm, 0, aTerm.getLength()); + return aTerm; } OUString SAL_CALL Hyphenator::makeInitCap(const OUString& aTerm, CharClass * pCC) { - sal_Int32 tlen = aTerm.getLength(); - if ((pCC) && (tlen)) { - OUString bTemp = aTerm.copy(0,1); - if (tlen > 1) - return ( pCC->toUpper_rtl(bTemp, 0, 1) - + pCC->toLower_rtl(aTerm,1,(tlen-1)) ); - - return pCC->toUpper_rtl(bTemp, 0, 1); + sal_Int32 tlen = aTerm.getLength(); + if ((pCC) && (tlen)) + { + OUString bTemp = aTerm.copy(0,1); + if (tlen > 1) + return ( pCC->toUpper_rtl(bTemp, 0, 1) + pCC->toLower_rtl(aTerm,1,(tlen-1)) ); + + return pCC->toUpper_rtl(bTemp, 0, 1); } - return aTerm; + return aTerm; } - - Reference< XInterface > SAL_CALL Hyphenator_CreateInstance( - const Reference< XMultiServiceFactory > & /*rSMgr*/ ) + const Reference< XMultiServiceFactory > & /*rSMgr*/ ) throw(Exception) { - Reference< XInterface > xService = (cppu::OWeakObject*) new Hyphenator; return xService; } -sal_Bool SAL_CALL - Hyphenator::addLinguServiceEventListener( - const Reference< XLinguServiceEventListener >& rxLstnr ) +sal_Bool SAL_CALL Hyphenator::addLinguServiceEventListener( + const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -787,9 +817,8 @@ sal_Bool SAL_CALL } -sal_Bool SAL_CALL - Hyphenator::removeLinguServiceEventListener( - const Reference< XLinguServiceEventListener >& rxLstnr ) +sal_Bool SAL_CALL Hyphenator::removeLinguServiceEventListener( + const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -804,8 +833,7 @@ sal_Bool SAL_CALL } -OUString SAL_CALL - Hyphenator::getServiceDisplayName( const Locale& /*rLocale*/ ) +OUString SAL_CALL Hyphenator::getServiceDisplayName( const Locale& /*rLocale*/ ) throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -813,8 +841,7 @@ OUString SAL_CALL } -void SAL_CALL - Hyphenator::initialize( const Sequence< Any >& rArguments ) +void SAL_CALL Hyphenator::initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -836,16 +863,15 @@ void SAL_CALL xPropHelper = pPropHelper; pPropHelper->AddAsPropListener(); //! after a reference is established } - else { + else + { DBG_ERROR( "wrong number of arguments in sequence" ); } - } } -void SAL_CALL - Hyphenator::dispose() +void SAL_CALL Hyphenator::dispose() throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -859,8 +885,7 @@ void SAL_CALL } -void SAL_CALL - Hyphenator::addEventListener( const Reference< XEventListener >& rxListener ) +void SAL_CALL Hyphenator::addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -870,8 +895,7 @@ void SAL_CALL } -void SAL_CALL - Hyphenator::removeEventListener( const Reference< XEventListener >& rxListener ) +void SAL_CALL Hyphenator::removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -927,32 +951,6 @@ Sequence< OUString > Hyphenator::getSupportedServiceNames_Static() return aSNS; } - -sal_Bool SAL_CALL Hyphenator_writeInfo( - void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey ) -{ - - try - { - String aImpl( '/' ); - aImpl += Hyphenator::getImplementationName_Static().getStr(); - aImpl.AppendAscii( "/UNO/SERVICES" ); - Reference< registry::XRegistryKey > xNewKey = - pRegistryKey->createKey( aImpl ); - Sequence< OUString > aServices = - Hyphenator::getSupportedServiceNames_Static(); - for( INT32 i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[i] ); - - return sal_True; - } - catch(Exception &) - { - return sal_False; - } -} - - void * SAL_CALL Hyphenator_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * ) { diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx index 00977732f..86508918e 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx @@ -65,7 +65,7 @@ struct HDInfo { HyphenDict * aPtr; OUString aName; Locale aLoc; - rtl_TextEncoding aEnc; + rtl_TextEncoding eEnc; CharClass * apCC; }; @@ -83,12 +83,12 @@ class Hyphenator : > { Sequence< Locale > aSuppLocales; - HDInfo * aDicts; - sal_Int32 numdict; + HDInfo * aDicts; + sal_Int32 numdict; ::cppu::OInterfaceContainerHelper aEvtListeners; Reference< XPropertyChangeListener > xPropHelper; - Reference< XMultiServiceFactory > rSMgr; + Reference< XMultiServiceFactory > rSMgr; linguistic::PropertyHelper_Hyphen * pPropHelper; BOOL bDisposing; @@ -108,88 +108,38 @@ public: virtual ~Hyphenator(); // XSupportedLocales (for XHyphenator) - virtual Sequence< Locale > SAL_CALL getLocales() - throw(RuntimeException); - virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) - throw(RuntimeException); + virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException); + virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException); // XHyphenator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL - hyphenate( const ::rtl::OUString& aWord, - const ::com::sun::star::lang::Locale& aLocale, - sal_Int16 nMaxLeading, - const ::com::sun::star::beans::PropertyValues& aProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL - queryAlternativeSpelling( const ::rtl::OUString& aWord, - const ::com::sun::star::lang::Locale& aLocale, - sal_Int16 nIndex, - const ::com::sun::star::beans::PropertyValues& aProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL - createPossibleHyphens( const ::rtl::OUString& aWord, - const ::com::sun::star::lang::Locale& aLocale, - const ::com::sun::star::beans::PropertyValues& aProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const ::rtl::OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nMaxLeading, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const ::rtl::OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nIndex, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const ::rtl::OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XLinguServiceEventBroadcaster - virtual sal_Bool SAL_CALL - addLinguServiceEventListener( - const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException); - virtual sal_Bool SAL_CALL - removeLinguServiceEventListener( - const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException); + virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException); + virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException); // XServiceDisplayName - virtual OUString SAL_CALL - getServiceDisplayName( const Locale& rLocale ) - throw(RuntimeException); + virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException); // XInitialization - virtual void SAL_CALL - initialize( const Sequence< Any >& rArguments ) - throw(Exception, RuntimeException); + virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException); // XComponent - virtual void SAL_CALL - dispose() - throw(RuntimeException); - virtual void SAL_CALL - addEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException); - virtual void SAL_CALL - removeEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException); - - //////////////////////////////////////////////////////////// - // Service specific part - // + virtual void SAL_CALL dispose() throw(RuntimeException); + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); // XServiceInfo - virtual OUString SAL_CALL - getImplementationName() - throw(RuntimeException); - virtual sal_Bool SAL_CALL - supportsService( const OUString& rServiceName ) - throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw(RuntimeException); - - - static inline OUString - getImplementationName_Static() throw(); - static Sequence< OUString > - getSupportedServiceNames_Static() throw(); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + static inline OUString getImplementationName_Static() throw(); + static Sequence< OUString > getSupportedServiceNames_Static() throw(); + private: sal_uInt16 SAL_CALL capitalType(const OUString&, CharClass *); diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk index f3626c703..6f767d8bf 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk @@ -91,3 +91,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : target.mk + +ALLTAR : $(MISC)/hyphen.component + +$(MISC)/hyphen.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + hyphen.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt hyphen.component diff --git a/lingucomponent/source/languageguessing/guesslang.component b/lingucomponent/source/languageguessing/guesslang.component new file mode 100644 index 000000000..633a489c3 --- /dev/null +++ b/lingucomponent/source/languageguessing/guesslang.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.lingu2.LanguageGuessing"> + <service name="com.sun.star.linguistic2.LanguageGuessing"/> + </implementation> +</component> diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index 8b864b3c0..0314f1757 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -465,13 +465,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -sal_Bool SAL_CALL component_writeInfo( - XMultiServiceFactory * xMgr, registry::XRegistryKey * xRegistry ) -{ - return ::cppu::component_writeInfoHelper( - xMgr, xRegistry, s_component_entries ); -} - void * SAL_CALL component_getFactory( sal_Char const * implName, lang::XMultiServiceFactory * xMgr, registry::XRegistryKey * xRegistry ) diff --git a/lingucomponent/source/languageguessing/makefile.mk b/lingucomponent/source/languageguessing/makefile.mk index ebad4076b..624ccba3c 100644 --- a/lingucomponent/source/languageguessing/makefile.mk +++ b/lingucomponent/source/languageguessing/makefile.mk @@ -78,3 +78,11 @@ DEF1NAME =$(SHL1TARGET) .INCLUDE : target.mk + +ALLTAR : $(MISC)/guesslang.component + +$(MISC)/guesslang.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + guesslang.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt guesslang.component diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx index 142fc4f7b..15c019a14 100644 --- a/lingucomponent/source/lingutil/lingutil.cxx +++ b/lingucomponent/source/lingutil/lingutil.cxx @@ -50,6 +50,7 @@ #include <unotools/pathoptions.hxx> #include <rtl/ustring.hxx> #include <rtl/string.hxx> +#include <rtl/tencinfo.h> #include <linguistic/misc.hxx> #include <set> @@ -268,5 +269,25 @@ void MergeNewStyleDicsAndOldStyleDics( } } + +rtl_TextEncoding getTextEncodingFromCharset(const sal_Char* pCharset) +{ + // default result: used to indicate that we failed to get the proper encoding + rtl_TextEncoding eRet = RTL_TEXTENCODING_DONTKNOW; + + if (pCharset) + { + eRet = rtl_getTextEncodingFromMimeCharset(pCharset); + if (eRet == RTL_TEXTENCODING_DONTKNOW) + eRet = rtl_getTextEncodingFromUnixCharset(pCharset); + if (eRet == RTL_TEXTENCODING_DONTKNOW) + { + if (strcmp("ISCII-DEVANAGARI", pCharset) == 0) + eRet = RTL_TEXTENCODING_ISCII_DEVANAGARI; + } + } + return eRet; +} + ////////////////////////////////////////////////////////////////////// diff --git a/lingucomponent/source/lingutil/lingutil.hxx b/lingucomponent/source/lingutil/lingutil.hxx index 4edc469cf..18be81561 100644 --- a/lingucomponent/source/lingutil/lingutil.hxx +++ b/lingucomponent/source/lingutil/lingutil.hxx @@ -101,5 +101,13 @@ void MergeNewStyleDicsAndOldStyleDics( std::list< SvtLinguConfigDictionaryEntry /////////////////////////////////////////////////////////////////////////// + +//Find an encoding from a charset string, using +//rtl_getTextEncodingFromMimeCharset and falling back to +//rtl_getTextEncodingFromUnixCharset with the addition of +//ISCII-DEVANAGARI. On failure will return final fallback of +//RTL_TEXTENCODING_ISO_8859_1 +rtl_TextEncoding getTextEncodingFromCharset(const sal_Char* pCharset); + #endif diff --git a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component new file mode 100644 index 000000000..2f2f9e102 --- /dev/null +++ b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="org.openoffice.lingu.MacOSXSpellChecker"> + <service name="com.sun.star.linguistic2.SpellChecker"/> + </implementation> +</component> diff --git a/lingucomponent/source/spellcheck/macosxspell/macreg.cxx b/lingucomponent/source/spellcheck/macosxspell/macreg.cxx index bf84b274c..8c431d4be 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macreg.cxx +++ b/lingucomponent/source/spellcheck/macosxspell/macreg.cxx @@ -42,9 +42,6 @@ using namespace com::sun::star::registry; // declaration of external RegEntry-functions defined by the service objects // -extern sal_Bool SAL_CALL MacSpellChecker_writeInfo( - void * /*pServiceManager*/, XRegistryKey * pRegistryKey ); - extern void * SAL_CALL MacSpellChecker_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, @@ -57,12 +54,6 @@ extern void * SAL_CALL MacSpellChecker_getFactory( extern "C" { -sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, XRegistryKey * pRegistryKey ) -{ - return MacSpellChecker_writeInfo( pServiceManager, pRegistryKey ); -} - void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx index f19802066..61e2e77c6 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx @@ -644,32 +644,6 @@ Sequence< OUString > MacSpellChecker::getSupportedServiceNames_Static() return aSNS; } - -sal_Bool SAL_CALL MacSpellChecker_writeInfo( - void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey ) -{ - - try - { - String aImpl( '/' ); - aImpl += MacSpellChecker::getImplementationName_Static().getStr(); - aImpl.AppendAscii( "/UNO/SERVICES" ); - Reference< registry::XRegistryKey > xNewKey = - pRegistryKey->createKey( aImpl ); - Sequence< OUString > aServices = - MacSpellChecker::getSupportedServiceNames_Static(); - for( INT32 i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[i] ); - - return sal_True; - } - catch(Exception &) - { - return sal_False; - } -} - - void * SAL_CALL MacSpellChecker_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * ) { diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx index e681f9a3b..5fb9fbdd3 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx @@ -75,14 +75,14 @@ class MacSpellChecker : XServiceDisplayName > { - Sequence< Locale > aSuppLocales; + Sequence< Locale > aSuppLocales; // Hunspell ** aDicts; - rtl_TextEncoding * aDEncs; - Locale * aDLocs; - OUString * aDNames; - sal_Int32 numdict; - NSSpellChecker * macSpell; - int macTag; //unique tag for this doc + rtl_TextEncoding * aDEncs; + Locale * aDLocs; + OUString * aDNames; + sal_Int32 numdict; + NSSpellChecker * macSpell; + int macTag; //unique tag for this doc ::cppu::OInterfaceContainerHelper aEvtListeners; Reference< XPropertyChangeListener > xPropHelper; @@ -100,84 +100,43 @@ class MacSpellChecker : } INT16 GetSpellFailure( const OUString &rWord, const Locale &rLocale ); - Reference< XSpellAlternatives > - GetProposals( const OUString &rWord, const Locale &rLocale ); + Reference< XSpellAlternatives > GetProposals( const OUString &rWord, const Locale &rLocale ); public: MacSpellChecker(); virtual ~MacSpellChecker(); // XSupportedLocales (for XSpellChecker) - virtual Sequence< Locale > SAL_CALL - getLocales() - throw(RuntimeException); - virtual sal_Bool SAL_CALL - hasLocale( const Locale& rLocale ) - throw(RuntimeException); + virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException); + virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException); // XSpellChecker - virtual sal_Bool SAL_CALL - isValid( const OUString& rWord, const Locale& rLocale, - const PropertyValues& rProperties ) - throw(IllegalArgumentException, - RuntimeException); - virtual Reference< XSpellAlternatives > SAL_CALL - spell( const OUString& rWord, const Locale& rLocale, - const PropertyValues& rProperties ) - throw(IllegalArgumentException, - RuntimeException); + virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException); + virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException); // XLinguServiceEventBroadcaster - virtual sal_Bool SAL_CALL - addLinguServiceEventListener( - const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException); - virtual sal_Bool SAL_CALL - removeLinguServiceEventListener( - const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException); + virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException); + virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException); // XServiceDisplayName - virtual OUString SAL_CALL - getServiceDisplayName( const Locale& rLocale ) - throw(RuntimeException); + virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException); // XInitialization - virtual void SAL_CALL - initialize( const Sequence< Any >& rArguments ) - throw(Exception, RuntimeException); + virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException); // XComponent - virtual void SAL_CALL - dispose() - throw(RuntimeException); - virtual void SAL_CALL - addEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException); - virtual void SAL_CALL - removeEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException); - - //////////////////////////////////////////////////////////// - // Service specific part - // + virtual void SAL_CALL dispose() throw(RuntimeException); + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); // XServiceInfo - virtual OUString SAL_CALL - getImplementationName() - throw(RuntimeException); - virtual sal_Bool SAL_CALL - supportsService( const OUString& rServiceName ) - throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw(RuntimeException); - - - static inline OUString - getImplementationName_Static() throw(); - static Sequence< OUString > - getSupportedServiceNames_Static() throw(); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + + + static inline OUString getImplementationName_Static() throw(); + static Sequence< OUString > getSupportedServiceNames_Static() throw(); }; inline OUString MacSpellChecker::getImplementationName_Static() throw() diff --git a/lingucomponent/source/spellcheck/macosxspell/makefile.mk b/lingucomponent/source/spellcheck/macosxspell/makefile.mk index 6414560e0..4e88b808d 100644 --- a/lingucomponent/source/spellcheck/macosxspell/makefile.mk +++ b/lingucomponent/source/spellcheck/macosxspell/makefile.mk @@ -91,3 +91,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map dummy: @echo " Nothing to build for GUIBASE=$(GUIBASE)" .ENDIF + +ALLTAR : $(MISC)/MacOSXSpell.component + +$(MISC)/MacOSXSpell.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt MacOSXSpell.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt MacOSXSpell.component diff --git a/lingucomponent/source/spellcheck/spell/exports.dxp b/lingucomponent/source/spellcheck/spell/exports.dxp index b0f85bf7b..a9861e3ff 100644 --- a/lingucomponent/source/spellcheck/spell/exports.dxp +++ b/lingucomponent/source/spellcheck/spell/exports.dxp @@ -1,3 +1,2 @@ component_getFactory component_getImplementationEnvironment -component_writeInfo diff --git a/lingucomponent/source/spellcheck/spell/makefile.mk b/lingucomponent/source/spellcheck/spell/makefile.mk index 4173d4dba..56dd79939 100644 --- a/lingucomponent/source/spellcheck/spell/makefile.mk +++ b/lingucomponent/source/spellcheck/spell/makefile.mk @@ -85,3 +85,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : target.mk + +ALLTAR : $(MISC)/spell.component + +$(MISC)/spell.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + spell.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt spell.component diff --git a/lingucomponent/source/spellcheck/spell/spell.component b/lingucomponent/source/spellcheck/spell/spell.component new file mode 100644 index 000000000..9f951a8a8 --- /dev/null +++ b/lingucomponent/source/spellcheck/spell/spell.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="org.openoffice.lingu.MySpellSpellChecker"> + <service name="com.sun.star.linguistic2.SpellChecker"/> + </implementation> +</component> diff --git a/lingucomponent/source/spellcheck/spell/sreg.cxx b/lingucomponent/source/spellcheck/spell/sreg.cxx index 84373bd2c..fa2c67840 100644 --- a/lingucomponent/source/spellcheck/spell/sreg.cxx +++ b/lingucomponent/source/spellcheck/spell/sreg.cxx @@ -42,9 +42,6 @@ using namespace com::sun::star::registry; // declaration of external RegEntry-functions defined by the service objects // -extern sal_Bool SAL_CALL SpellChecker_writeInfo( - void * /*pServiceManager*/, XRegistryKey * pRegistryKey ); - extern void * SAL_CALL SpellChecker_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, @@ -56,12 +53,6 @@ extern void * SAL_CALL SpellChecker_getFactory( extern "C" { -sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, XRegistryKey * pRegistryKey ) -{ - return SpellChecker_writeInfo( pServiceManager, pRegistryKey ); -} - void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index 894f9fd33..58f4ddc71 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -27,6 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_lingucomponent.hxx" + #include <com/sun/star/uno/Reference.h> #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp> @@ -37,12 +38,10 @@ #include <unotools/processfactory.hxx> #include <osl/mutex.hxx> +#include <lingutil.hxx> #include <hunspell.hxx> #include <dictmgr.hxx> - -#ifndef _SPELLIMP_HXX #include <sspellimp.hxx> -#endif #include <linguistic/lngprops.hxx> #include <linguistic/spelldta.hxx> @@ -52,8 +51,7 @@ #include <unotools/useroptions.hxx> #include <osl/file.hxx> #include <rtl/ustrbuf.hxx> - -#include <lingutil.hxx> +#include <rtl/textenc.h> #include <list> #include <set> @@ -77,35 +75,37 @@ using namespace linguistic; SpellChecker::SpellChecker() : aEvtListeners ( GetLinguMutex() ) { - aDicts = NULL; + aDicts = NULL; aDEncs = NULL; aDLocs = NULL; aDNames = NULL; bDisposing = FALSE; pPropHelper = NULL; - numdict = 0; + numdict = 0; } SpellChecker::~SpellChecker() { - if (aDicts) { - for (int i = 0; i < numdict; i++) { + if (aDicts) + { + for (int i = 0; i < numdict; i++) + { if (aDicts[i]) delete aDicts[i]; aDicts[i] = NULL; - } - delete[] aDicts; - } - aDicts = NULL; - numdict = 0; - if (aDEncs) delete[] aDEncs; - aDEncs = NULL; - if (aDLocs) delete[] aDLocs; - aDLocs = NULL; - if (aDNames) delete[] aDNames; - aDNames = NULL; - if (pPropHelper) - pPropHelper->RemoveAsPropListener(); + } + delete[] aDicts; + } + aDicts = NULL; + numdict = 0; + if (aDEncs) delete[] aDEncs; + aDEncs = NULL; + if (aDLocs) delete[] aDLocs; + aDLocs = NULL; + if (aDNames) delete[] aDNames; + aDNames = NULL; + if (pPropHelper) + pPropHelper->RemoveAsPropListener(); } @@ -217,7 +217,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales() for (sal_Int32 i = 0; i < nLocales; ++i) { aDicts[k] = NULL; - aDEncs[k] = 0; + aDEncs[k] = RTL_TEXTENCODING_DONTKNOW; aDLocs[k] = MsLangId::convertLanguageToLocale( MsLangId::convertIsoStringToLanguage( aLocaleNames[i] )); // also both files have to be in the same directory and the @@ -272,84 +272,86 @@ sal_Bool SAL_CALL SpellChecker::hasLocale(const Locale& rLocale) return bRes; } + INT16 SpellChecker::GetSpellFailure( const OUString &rWord, const Locale &rLocale ) { - Hunspell * pMS; - rtl_TextEncoding aEnc; + Hunspell * pMS = NULL; + rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW; // initialize a myspell object for each dictionary once - // (note: mutex is held higher up in isValid) - + // (note: mutex is held higher up in isValid) INT16 nRes = -1; - // first handle smart quotes both single and double + // first handle smart quotes both single and double OUStringBuffer rBuf(rWord); - sal_Int32 n = rBuf.getLength(); - sal_Unicode c; - for (sal_Int32 ix=0; ix < n; ix++) { + sal_Int32 n = rBuf.getLength(); + sal_Unicode c; + for (sal_Int32 ix=0; ix < n; ix++) + { c = rBuf.charAt(ix); - if ((c == 0x201C) || (c == 0x201D)) rBuf.setCharAt(ix,(sal_Unicode)0x0022); - if ((c == 0x2018) || (c == 0x2019)) rBuf.setCharAt(ix,(sal_Unicode)0x0027); - } - OUString nWord(rBuf.makeStringAndClear()); + if ((c == 0x201C) || (c == 0x201D)) + rBuf.setCharAt(ix,(sal_Unicode)0x0022); + if ((c == 0x2018) || (c == 0x2019)) + rBuf.setCharAt(ix,(sal_Unicode)0x0027); + } + OUString nWord(rBuf.makeStringAndClear()); if (n) { - for (sal_Int32 i = 0; i < numdict; ++i) { + for (sal_Int32 i = 0; i < numdict; ++i) + { pMS = NULL; - aEnc = 0; + eEnc = RTL_TEXTENCODING_DONTKNOW; if (rLocale == aDLocs[i]) { - if (!aDicts[i]) - { - OUString dicpath = aDNames[i] + A2OU(".dic"); - OUString affpath = aDNames[i] + A2OU(".aff"); - OUString dict; - OUString aff; - osl::FileBase::getSystemPathFromFileURL(dicpath,dict); - osl::FileBase::getSystemPathFromFileURL(affpath,aff); - OString aTmpaff(OU2ENC(aff,osl_getThreadTextEncoding())); - OString aTmpdict(OU2ENC(dict,osl_getThreadTextEncoding())); + if (!aDicts[i]) + { + OUString dicpath = aDNames[i] + A2OU(".dic"); + OUString affpath = aDNames[i] + A2OU(".aff"); + OUString dict; + OUString aff; + osl::FileBase::getSystemPathFromFileURL(dicpath,dict); + osl::FileBase::getSystemPathFromFileURL(affpath,aff); + OString aTmpaff(OU2ENC(aff,osl_getThreadTextEncoding())); + OString aTmpdict(OU2ENC(dict,osl_getThreadTextEncoding())); #if defined(WNT) - // workaround for Windows specifc problem that the - // path length in calls to 'fopen' is limted to somewhat - // about 120+ characters which will usually be exceed when - // using dictionaries as extensions. - aTmpaff = Win_GetShortPathName( aff ); - aTmpdict = Win_GetShortPathName( dict ); + // workaround for Windows specifc problem that the + // path length in calls to 'fopen' is limted to somewhat + // about 120+ characters which will usually be exceed when + // using dictionaries as extensions. + aTmpaff = Win_GetShortPathName( aff ); + aTmpdict = Win_GetShortPathName( dict ); #endif - aDicts[i] = new Hunspell(aTmpaff.getStr(),aTmpdict.getStr()); - aDEncs[i] = 0; - if (aDicts[i]) { - char * dic_encoding = aDicts[i]->get_dic_encoding(); - aDEncs[i] = rtl_getTextEncodingFromUnixCharset(aDicts[i]->get_dic_encoding()); - if (aDEncs[i] == RTL_TEXTENCODING_DONTKNOW) { - if (strcmp("ISCII-DEVANAGARI", dic_encoding) == 0) { - aDEncs[i] = RTL_TEXTENCODING_ISCII_DEVANAGARI; - } else if (strcmp("UTF-8", dic_encoding) == 0) { - aDEncs[i] = RTL_TEXTENCODING_UTF8; - } - } - } - } - pMS = aDicts[i]; - aEnc = aDEncs[i]; - } + aDicts[i] = new Hunspell(aTmpaff.getStr(),aTmpdict.getStr()); + aDEncs[i] = RTL_TEXTENCODING_DONTKNOW; + if (aDicts[i]) + aDEncs[i] = getTextEncodingFromCharset(aDicts[i]->get_dic_encoding()); + } + pMS = aDicts[i]; + eEnc = aDEncs[i]; + } + if (pMS) - { - OString aWrd(OU2ENC(nWord,aEnc)); + { + // we don't want to work with a default text encoding since following incorrect + // results may occur only for specific text and thus may be hard to notice. + // Thus better always make a clean exit here if the text encoding is in question. + // Hopefully something not working at all will raise proper attention quickly. ;-) + DBG_ASSERT( eEnc != RTL_TEXTENCODING_DONTKNOW, "failed to get text encoding! (maybe incorrect encoding string in file)" ); + if (eEnc == RTL_TEXTENCODING_DONTKNOW) + return -1; + + OString aWrd(OU2ENC(nWord,eEnc)); int rVal = pMS->spell((char*)aWrd.getStr()); - if (rVal != 1) - { - nRes = SpellFailure::SPELLING_ERROR; - } else { - return -1; - } - pMS = NULL; + if (rVal != 1) + nRes = SpellFailure::SPELLING_ERROR; + else + return -1; + pMS = NULL; } } } @@ -358,8 +360,7 @@ INT16 SpellChecker::GetSpellFailure( const OUString &rWord, const Locale &rLocal } -sal_Bool SAL_CALL - SpellChecker::isValid( const OUString& rWord, const Locale& rLocale, +sal_Bool SAL_CALL SpellChecker::isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException) { @@ -375,6 +376,9 @@ sal_Bool SAL_CALL return TRUE; #endif + // return FALSE to process SPELLML requests (they are longer than the header) + if (rWord.match(A2OU(SPELLML_HEADER), 0) && (rWord.getLength() > 10)) return FALSE; + // Get property values to be used. // These are be the default values set in the SN_LINGU_PROPERTIES // PropertySet which are overridden by the supplied ones from the @@ -390,11 +394,11 @@ sal_Bool SAL_CALL { INT16 nLang = LocaleToLanguage( rLocale ); // postprocess result for errors that should be ignored - if ( (!rHelper.IsSpellUpperCase() && IsUpper( rWord, nLang )) - || (!rHelper.IsSpellWithDigits() && HasDigits( rWord )) - || (!rHelper.IsSpellCapitalization() - && nFailure == SpellFailure::CAPTION_ERROR) - ) + const bool bIgnoreError = + (!rHelper.IsSpellUpperCase() && IsUpper( rWord, nLang )) || + (!rHelper.IsSpellWithDigits() && HasDigits( rWord )) || + (!rHelper.IsSpellCapitalization() && nFailure == SpellFailure::CAPTION_ERROR); + if (bIgnoreError) nFailure = -1; } @@ -410,23 +414,26 @@ Reference< XSpellAlternatives > // Especially it may give a list of suggested (correct) words: Reference< XSpellAlternatives > xRes; - // note: mutex is held by higher up by spell which covers both + // note: mutex is held by higher up by spell which covers both - Hunspell* pMS; - rtl_TextEncoding aEnc; - int count; - int numsug = 0; + Hunspell* pMS = NULL; + rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW; + int count = 0; + int numsug = 0; - // first handle smart quotes (single and double) + // first handle smart quotes (single and double) OUStringBuffer rBuf(rWord); - sal_Int32 n = rBuf.getLength(); - sal_Unicode c; - for (sal_Int32 ix=0; ix < n; ix++) { - c = rBuf.charAt(ix); - if ((c == 0x201C) || (c == 0x201D)) rBuf.setCharAt(ix,(sal_Unicode)0x0022); - if ((c == 0x2018) || (c == 0x2019)) rBuf.setCharAt(ix,(sal_Unicode)0x0027); - } - OUString nWord(rBuf.makeStringAndClear()); + sal_Int32 n = rBuf.getLength(); + sal_Unicode c; + for (sal_Int32 ix=0; ix < n; ix++) + { + c = rBuf.charAt(ix); + if ((c == 0x201C) || (c == 0x201D)) + rBuf.setCharAt(ix,(sal_Unicode)0x0022); + if ((c == 0x2018) || (c == 0x2019)) + rBuf.setCharAt(ix,(sal_Unicode)0x0027); + } + OUString nWord(rBuf.makeStringAndClear()); if (n) { @@ -434,56 +441,55 @@ Reference< XSpellAlternatives > Sequence< OUString > aStr( 0 ); - for (int i =0; i < numdict; i++) { + for (int i =0; i < numdict; i++) + { pMS = NULL; - aEnc = 0; - count = 0; + eEnc = RTL_TEXTENCODING_DONTKNOW; + count = 0; if (rLocale == aDLocs[i]) { - pMS = aDicts[i]; - aEnc = aDEncs[i]; - } + pMS = aDicts[i]; + eEnc = aDEncs[i]; + } if (pMS) { char ** suglst = NULL; - OString aWrd(OU2ENC(nWord,aEnc)); - count = pMS->suggest(&suglst, (const char *) aWrd.getStr()); - - if (count) { - aStr.realloc( numsug + count ); - OUString *pStr = aStr.getArray(); - for (int ii=0; ii < count; ++ii) - { - OUString cvtwrd(suglst[ii],strlen(suglst[ii]),aEnc); - pStr[numsug + ii] = cvtwrd; - } - pMS->free_list(&suglst, count); - numsug += count; + OString aWrd(OU2ENC(nWord,eEnc)); + count = pMS->suggest(&suglst, (const char *) aWrd.getStr()); + + if (count) + { + aStr.realloc( numsug + count ); + OUString *pStr = aStr.getArray(); + for (int ii=0; ii < count; ++ii) + { + OUString cvtwrd(suglst[ii],strlen(suglst[ii]),eEnc); + pStr[numsug + ii] = cvtwrd; } - } + pMS->free_list(&suglst, count); + numsug += count; + } + } } - // now return an empty alternative for no suggestions or the list of alternatives if some found + // now return an empty alternative for no suggestions or the list of alternatives if some found SpellAlternatives *pAlt = new SpellAlternatives; - String aTmp(rWord); + String aTmp(rWord); pAlt->SetWordLanguage( aTmp, nLang ); pAlt->SetFailureType( SpellFailure::SPELLING_ERROR ); pAlt->SetAlternatives( aStr ); xRes = pAlt; - return xRes; - - } return xRes; + } + return xRes; } - - -Reference< XSpellAlternatives > SAL_CALL - SpellChecker::spell( const OUString& rWord, const Locale& rLocale, - const PropertyValues& rProperties ) +Reference< XSpellAlternatives > SAL_CALL SpellChecker::spell( + const OUString& rWord, const Locale& rLocale, + const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -508,7 +514,7 @@ Reference< XSpellAlternatives > SAL_CALL Reference< XInterface > SAL_CALL SpellChecker_CreateInstance( - const Reference< XMultiServiceFactory > & /*rSMgr*/ ) + const Reference< XMultiServiceFactory > & /*rSMgr*/ ) throw(Exception) { @@ -517,9 +523,8 @@ Reference< XInterface > SAL_CALL SpellChecker_CreateInstance( } -sal_Bool SAL_CALL - SpellChecker::addLinguServiceEventListener( - const Reference< XLinguServiceEventListener >& rxLstnr ) +sal_Bool SAL_CALL SpellChecker::addLinguServiceEventListener( + const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -533,9 +538,8 @@ sal_Bool SAL_CALL } -sal_Bool SAL_CALL - SpellChecker::removeLinguServiceEventListener( - const Reference< XLinguServiceEventListener >& rxLstnr ) +sal_Bool SAL_CALL SpellChecker::removeLinguServiceEventListener( + const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -550,8 +554,7 @@ sal_Bool SAL_CALL } -OUString SAL_CALL - SpellChecker::getServiceDisplayName( const Locale& /*rLocale*/ ) +OUString SAL_CALL SpellChecker::getServiceDisplayName( const Locale& /*rLocale*/ ) throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -559,8 +562,7 @@ OUString SAL_CALL } -void SAL_CALL - SpellChecker::initialize( const Sequence< Any >& rArguments ) +void SAL_CALL SpellChecker::initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -582,16 +584,15 @@ void SAL_CALL xPropHelper = pPropHelper; pPropHelper->AddAsPropListener(); //! after a reference is established } - else { + else + { DBG_ERROR( "wrong number of arguments in sequence" ); } - } } -void SAL_CALL - SpellChecker::dispose() +void SAL_CALL SpellChecker::dispose() throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -605,8 +606,7 @@ void SAL_CALL } -void SAL_CALL - SpellChecker::addEventListener( const Reference< XEventListener >& rxListener ) +void SAL_CALL SpellChecker::addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -616,8 +616,7 @@ void SAL_CALL } -void SAL_CALL - SpellChecker::removeEventListener( const Reference< XEventListener >& rxListener ) +void SAL_CALL SpellChecker::removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -673,32 +672,6 @@ Sequence< OUString > SpellChecker::getSupportedServiceNames_Static() return aSNS; } - -sal_Bool SAL_CALL SpellChecker_writeInfo( - void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey ) -{ - - try - { - String aImpl( '/' ); - aImpl += SpellChecker::getImplementationName_Static().getStr(); - aImpl.AppendAscii( "/UNO/SERVICES" ); - Reference< registry::XRegistryKey > xNewKey = - pRegistryKey->createKey( aImpl ); - Sequence< OUString > aServices = - SpellChecker::getSupportedServiceNames_Static(); - for( INT32 i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[i] ); - - return sal_True; - } - catch(Exception &) - { - return sal_False; - } -} - - void * SAL_CALL SpellChecker_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * ) { diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx index b87416a3d..adc8ca953 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx @@ -69,11 +69,11 @@ class SpellChecker : > { Sequence< Locale > aSuppLocales; - Hunspell ** aDicts; - rtl_TextEncoding * aDEncs; - Locale * aDLocs; - OUString * aDNames; - sal_Int32 numdict; + Hunspell ** aDicts; + rtl_TextEncoding * aDEncs; + Locale * aDLocs; + OUString * aDNames; + sal_Int32 numdict; ::cppu::OInterfaceContainerHelper aEvtListeners; Reference< XPropertyChangeListener > xPropHelper; @@ -91,84 +91,43 @@ class SpellChecker : } INT16 GetSpellFailure( const OUString &rWord, const Locale &rLocale ); - Reference< XSpellAlternatives > - GetProposals( const OUString &rWord, const Locale &rLocale ); + Reference< XSpellAlternatives > GetProposals( const OUString &rWord, const Locale &rLocale ); public: SpellChecker(); virtual ~SpellChecker(); // XSupportedLocales (for XSpellChecker) - virtual Sequence< Locale > SAL_CALL - getLocales() - throw(RuntimeException); - virtual sal_Bool SAL_CALL - hasLocale( const Locale& rLocale ) - throw(RuntimeException); + virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException); + virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException); // XSpellChecker - virtual sal_Bool SAL_CALL - isValid( const OUString& rWord, const Locale& rLocale, - const PropertyValues& rProperties ) - throw(IllegalArgumentException, - RuntimeException); - virtual Reference< XSpellAlternatives > SAL_CALL - spell( const OUString& rWord, const Locale& rLocale, - const PropertyValues& rProperties ) - throw(IllegalArgumentException, - RuntimeException); + virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException); + virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException); // XLinguServiceEventBroadcaster - virtual sal_Bool SAL_CALL - addLinguServiceEventListener( - const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException); - virtual sal_Bool SAL_CALL - removeLinguServiceEventListener( - const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException); + virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException); + virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException); // XServiceDisplayName - virtual OUString SAL_CALL - getServiceDisplayName( const Locale& rLocale ) - throw(RuntimeException); + virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException); // XInitialization - virtual void SAL_CALL - initialize( const Sequence< Any >& rArguments ) - throw(Exception, RuntimeException); + virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException); // XComponent - virtual void SAL_CALL - dispose() - throw(RuntimeException); - virtual void SAL_CALL - addEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException); - virtual void SAL_CALL - removeEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException); - - //////////////////////////////////////////////////////////// - // Service specific part - // + virtual void SAL_CALL dispose() throw(RuntimeException); + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); // XServiceInfo - virtual OUString SAL_CALL - getImplementationName() - throw(RuntimeException); - virtual sal_Bool SAL_CALL - supportsService( const OUString& rServiceName ) - throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw(RuntimeException); - - - static inline OUString - getImplementationName_Static() throw(); - static Sequence< OUString > - getSupportedServiceNames_Static() throw(); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + + + static inline OUString getImplementationName_Static() throw(); + static Sequence< OUString > getSupportedServiceNames_Static() throw(); }; inline OUString SpellChecker::getImplementationName_Static() throw() @@ -177,7 +136,6 @@ inline OUString SpellChecker::getImplementationName_Static() throw() } - /////////////////////////////////////////////////////////////////////////// #endif diff --git a/lingucomponent/source/thesaurus/libnth/exports.dxp b/lingucomponent/source/thesaurus/libnth/exports.dxp index b0f85bf7b..a9861e3ff 100644 --- a/lingucomponent/source/thesaurus/libnth/exports.dxp +++ b/lingucomponent/source/thesaurus/libnth/exports.dxp @@ -1,3 +1,2 @@ component_getFactory component_getImplementationEnvironment -component_writeInfo diff --git a/lingucomponent/source/thesaurus/libnth/lnth.component b/lingucomponent/source/thesaurus/libnth/lnth.component new file mode 100644 index 000000000..bea91b94c --- /dev/null +++ b/lingucomponent/source/thesaurus/libnth/lnth.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="org.openoffice.lingu.new.Thesaurus"> + <service name="com.sun.star.linguistic2.Thesaurus"/> + </implementation> +</component> diff --git a/lingucomponent/source/thesaurus/libnth/makefile.mk b/lingucomponent/source/thesaurus/libnth/makefile.mk index 58e4d97e5..91d39d2d3 100644 --- a/lingucomponent/source/thesaurus/libnth/makefile.mk +++ b/lingucomponent/source/thesaurus/libnth/makefile.mk @@ -105,3 +105,11 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : target.mk + +ALLTAR : $(MISC)/lnth.component + +$(MISC)/lnth.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + lnth.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt lnth.component diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx index c8bfd3c5e..12253528f 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx +++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx @@ -48,11 +48,11 @@ class Meaning : { ::com::sun::star::uno::Sequence< ::rtl::OUString > aSyn; // list of synonyms, may be empty. ::rtl::OUString aTerm; - INT16 nLanguage; + INT16 nLanguage; #if 0 // this is for future use by a German thesaurus - BOOL bIsGermanPreReform; + BOOL bIsGermanPreReform; #endif // disallow copy-constructor and assignment-operator for now @@ -68,22 +68,12 @@ public: virtual ~Meaning(); // XMeaning - virtual ::rtl::OUString SAL_CALL - getMeaning() - throw(::com::sun::star::uno::RuntimeException); - - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL - querySynonyms() - throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getMeaning() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL querySynonyms() throw(::com::sun::star::uno::RuntimeException); // non-interface specific functions - void SetSynonyms( - const ::com::sun::star::uno::Sequence< ::rtl::OUString > - &rSyn ); - - void SetMeaning(const ::rtl::OUString &rTerm ); - - + void SetSynonyms( const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rSyn ); + void SetMeaning( const ::rtl::OUString &rTerm ); }; diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index dd1685056..275049ee1 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_lingucomponent.hxx" -// include <stdio.h> #include <com/sun/star/uno/Reference.h> - #include <cppuhelper/factory.hxx> // helper for factories #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -43,6 +41,8 @@ #include <rtl/string.hxx> #include <rtl/ustrbuf.hxx> +#include <rtl/textenc.h> + #include "nthesimp.hxx" #include <linguistic/misc.hxx> #include <linguistic/lngprops.hxx> @@ -100,23 +100,27 @@ Thesaurus::Thesaurus() : aTEncs = NULL; aTLocs = NULL; aTNames = NULL; - numthes = 0; + numthes = 0; } Thesaurus::~Thesaurus() { - if (aThes) { - for (int i = 0; i < numthes; i++) { + if (aThes) + { + for (int i = 0; i < numthes; i++) + { if (aThes[i]) delete aThes[i]; aThes[i] = NULL; } delete[] aThes; } aThes = NULL; - if (aCharSetInfo) { - for (int i = 0; i < numthes; i++) { + if (aCharSetInfo) + { + for (int i = 0; i < numthes; i++) + { if (aCharSetInfo[i]) delete aCharSetInfo[i]; aCharSetInfo[i] = NULL; } @@ -244,7 +248,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales() for (sal_Int32 i = 0; i < nLocales; ++i) { aThes[k] = NULL; - aTEncs[k] = 0; + aTEncs[k] = RTL_TEXTENCODING_DONTKNOW; aTLocs[k] = MsLangId::convertLanguageToLocale( MsLangId::convertIsoStringToLanguage( aDictIt->aLocaleNames[i] )); aCharSetInfo[k] = new CharClass( aTLocs[k] ); @@ -302,28 +306,28 @@ sal_Bool SAL_CALL Thesaurus::hasLocale(const Locale& rLocale) } -Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL - Thesaurus::queryMeanings( const OUString& qTerm, const Locale& rLocale, - const PropertyValues& rProperties) - throw(IllegalArgumentException, RuntimeException) +Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryMeanings( + const OUString& qTerm, const Locale& rLocale, + const PropertyValues& rProperties) + throw(IllegalArgumentException, RuntimeException) { - MutexGuard aGuard( GetLinguMutex() ); + MutexGuard aGuard( GetLinguMutex() ); - uno::Sequence< Reference< XMeaning > > aMeanings( 1 ); - uno::Sequence< Reference< XMeaning > > noMeanings( 0 ); - uno::Reference< XLinguServiceManager > xLngSvcMgr( GetLngSvcMgr_Impl() ); - uno::Reference< XSpellChecker1 > xSpell; + uno::Sequence< Reference< XMeaning > > aMeanings( 1 ); + uno::Sequence< Reference< XMeaning > > noMeanings( 0 ); + uno::Reference< XLinguServiceManager > xLngSvcMgr( GetLngSvcMgr_Impl() ); + uno::Reference< XSpellChecker1 > xSpell; - OUString rTerm(qTerm); - OUString pTerm(qTerm); - sal_uInt16 ct = CAPTYPE_UNKNOWN; - sal_Int32 stem = 0; - sal_Int32 stem2 = 0; + OUString rTerm(qTerm); + OUString pTerm(qTerm); + sal_uInt16 ct = CAPTYPE_UNKNOWN; + sal_Int32 stem = 0; + sal_Int32 stem2 = 0; - INT16 nLanguage = LocaleToLanguage( rLocale ); + INT16 nLanguage = LocaleToLanguage( rLocale ); - if (nLanguage == LANGUAGE_NONE || !rTerm.getLength()) - return noMeanings; + if (nLanguage == LANGUAGE_NONE || !rTerm.getLength()) + return noMeanings; if (!hasLocale( rLocale )) #ifdef LINGU_EXCEPTIONS @@ -332,195 +336,202 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL return noMeanings; #endif - if (prevTerm == qTerm && prevLocale == nLanguage) return prevMeanings; + if (prevTerm == qTerm && prevLocale == nLanguage) + return prevMeanings; - mentry * pmean = NULL; + mentry * pmean = NULL; sal_Int32 nmean = 0; - PropertyHelper_Thes &rHelper = GetPropHelper(); - rHelper.SetTmpPropVals( rProperties ); + PropertyHelper_Thes &rHelper = GetPropHelper(); + rHelper.SetTmpPropVals( rProperties ); - MyThes * pTH = NULL; - rtl_TextEncoding aEnc = 0; - CharClass * pCC = NULL; + MyThes * pTH = NULL; + rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW; + CharClass * pCC = NULL; - // find the first thesaurus that matches the locale - for (int i =0; i < numthes; i++) { - if (rLocale == aTLocs[i]) + // find the first thesaurus that matches the locale + for (int i =0; i < numthes; i++) + { + if (rLocale == aTLocs[i]) + { + // open up and intialize this thesaurus if need be + if (!aThes[i]) { - // open up and intialize this thesaurus if need be - if (!aThes[i]) - { - OUString datpath = aTNames[i] + A2OU(".dat"); - OUString idxpath = aTNames[i] + A2OU(".idx"); - OUString ndat; - OUString nidx; - osl::FileBase::getSystemPathFromFileURL(datpath,ndat); - osl::FileBase::getSystemPathFromFileURL(idxpath,nidx); - OString aTmpidx(OU2ENC(nidx,osl_getThreadTextEncoding())); - OString aTmpdat(OU2ENC(ndat,osl_getThreadTextEncoding())); + OUString datpath = aTNames[i] + A2OU(".dat"); + OUString idxpath = aTNames[i] + A2OU(".idx"); + OUString ndat; + OUString nidx; + osl::FileBase::getSystemPathFromFileURL(datpath,ndat); + osl::FileBase::getSystemPathFromFileURL(idxpath,nidx); + OString aTmpidx(OU2ENC(nidx,osl_getThreadTextEncoding())); + OString aTmpdat(OU2ENC(ndat,osl_getThreadTextEncoding())); #if defined(WNT) - // workaround for Windows specifc problem that the - // path length in calls to 'fopen' is limted to somewhat - // about 120+ characters which will usually be exceed when - // using dictionaries as extensions. - aTmpidx = Win_GetShortPathName( nidx ); - aTmpdat = Win_GetShortPathName( ndat ); + // workaround for Windows specifc problem that the + // path length in calls to 'fopen' is limted to somewhat + // about 120+ characters which will usually be exceed when + // using dictionaries as extensions. + aTmpidx = Win_GetShortPathName( nidx ); + aTmpdat = Win_GetShortPathName( ndat ); #endif - aThes[i] = new MyThes(aTmpidx.getStr(),aTmpdat.getStr()); - if (aThes[i]) { - const char * enc_string = aThes[i]->get_th_encoding(); - if (!enc_string) { - aTEncs[i] = rtl_getTextEncodingFromUnixCharset("ISO8859-1"); - } else { - aTEncs[i] = rtl_getTextEncodingFromUnixCharset(enc_string); - if (aTEncs[i] == RTL_TEXTENCODING_DONTKNOW) { - if (strcmp("ISCII-DEVANAGARI", enc_string) == 0) { - aTEncs[i] = RTL_TEXTENCODING_ISCII_DEVANAGARI; - } else if (strcmp("UTF-8", enc_string) == 0) { - aTEncs[i] = RTL_TEXTENCODING_UTF8; - } - } - } - } - } - pTH = aThes[i]; - aEnc = aTEncs[i]; - pCC = aCharSetInfo[i]; - - if (pTH) - break; + aThes[i] = new MyThes(aTmpidx.getStr(),aTmpdat.getStr()); + if (aThes[i]) + aTEncs[i] = getTextEncodingFromCharset(aThes[i]->get_th_encoding()); + } + pTH = aThes[i]; + eEnc = aTEncs[i]; + pCC = aCharSetInfo[i]; + + if (pTH) + break; } } - while (pTH) { - // convert word to all lower case for searching - if (!stem) ct = capitalType(rTerm, pCC); - OUString nTerm(makeLowerCase(rTerm, pCC)); - OString aTmp( OU2ENC(nTerm, aEnc) ); - nmean = pTH->Lookup(aTmp.getStr(),aTmp.getLength(),&pmean); + // we don't want to work with a default text encoding since following incorrect + // results may occur only for specific text and thus may be hard to notice. + // Thus better always make a clean exit here if the text encoding is in question. + // Hopefully something not working at all will raise proper attention quickly. ;-) + DBG_ASSERT( eEnc != RTL_TEXTENCODING_DONTKNOW, "failed to get text encoding! (maybe incorrect encoding string in file)" ); + if (eEnc == RTL_TEXTENCODING_DONTKNOW) + return noMeanings; + + while (pTH) + { + // convert word to all lower case for searching + if (!stem) + ct = capitalType(rTerm, pCC); + OUString nTerm(makeLowerCase(rTerm, pCC)); + OString aTmp( OU2ENC(nTerm, eEnc) ); + nmean = pTH->Lookup(aTmp.getStr(),aTmp.getLength(),&pmean); - if (nmean) aMeanings.realloc( nmean ); + if (nmean) + aMeanings.realloc( nmean ); - mentry * pe = pmean; - OUString codeTerm = qTerm; - Reference< XSpellAlternatives > xTmpRes2; + mentry * pe = pmean; + OUString codeTerm = qTerm; + Reference< XSpellAlternatives > xTmpRes2; - if (stem) { - xTmpRes2 = xSpell->spell( A2OU("<?xml?><query type='analyze'><word>") + + if (stem) + { + xTmpRes2 = xSpell->spell( A2OU("<?xml?><query type='analyze'><word>") + pTerm + A2OU("</word></query>"), nLanguage, rProperties ); - if (xTmpRes2.is()) { - Sequence<OUString>seq = xTmpRes2->getAlternatives(); - if (seq.getLength() > 0) { + if (xTmpRes2.is()) + { + Sequence<OUString>seq = xTmpRes2->getAlternatives(); + if (seq.getLength() > 0) + { codeTerm = seq[0]; stem2 = 1; - } + } #if 0 - OString o = OUStringToOString(codeTerm, rtl_getTextEncodingFromUnixCharset("UTF-8")); - fprintf(stderr, "CODETERM: %s\n", o.pData->buffer); + OString o = OUStringToOString(codeTerm, RTL_TEXTENCODING_UTF8); + fprintf(stderr, "CODETERM: %s\n", o.pData->buffer); #endif - } - } - - for (int j = 0; j < nmean; j++) { - int count = pe->count; - if (count) { - Sequence< OUString > aStr( count ); - OUString *pStr = aStr.getArray(); - - for (int i=0; i < count; i++) { - OUString sTerm(pe->psyns[i],strlen(pe->psyns[i]),aEnc ); - sal_Int32 catpos = sTerm.indexOf('('); - sal_Int32 catpos2 = 0; - OUString catst; - OUString catst2; - if (catpos > 2) { - // remove category name for affixation and casing - catst = A2OU(" ") + sTerm.copy(catpos); - sTerm = sTerm.copy(0, catpos); - sTerm = sTerm.trim(); - } - // generate synonyms with affixes - if (stem && stem2) { - Reference< XSpellAlternatives > xTmpRes; - xTmpRes = xSpell->spell( A2OU("<?xml?><query type='generate'><word>") + - sTerm + A2OU("</word>") + codeTerm + A2OU("</query>"), nLanguage, rProperties ); - if (xTmpRes.is()) { - Sequence<OUString>seq = xTmpRes->getAlternatives(); - for (int k = 0; k < seq.getLength(); k++) { - OString o = OUStringToOString(seq[k], rtl_getTextEncodingFromUnixCharset("UTF-8")); - } - if (seq.getLength() > 0) sTerm = seq[0]; - } - } - if (catpos2) sTerm = catst2 + sTerm; - - sal_uInt16 ct1 = capitalType(sTerm, pCC); - if (CAPTYPE_MIXED == ct1) - ct = ct1; - OUString cTerm; - switch (ct) { - case CAPTYPE_ALLCAP: - { - cTerm = makeUpperCase(sTerm, pCC); - break; - } - case CAPTYPE_INITCAP: - { - cTerm = makeInitCap(sTerm, pCC); - break; - } - default: - { - cTerm = sTerm; - break; - } - } - OUString aAlt( cTerm + catst); - pStr[i] = aAlt; - } + } + } + + for (int j = 0; j < nmean; j++) + { + int count = pe->count; + if (count) + { + Sequence< OUString > aStr( count ); + OUString *pStr = aStr.getArray(); + + for (int i=0; i < count; i++) + { + OUString sTerm(pe->psyns[i],strlen(pe->psyns[i]),eEnc ); + sal_Int32 catpos = sTerm.indexOf('('); + sal_Int32 catpos2 = 0; + OUString catst; + OUString catst2; + if (catpos > 2) + { + // remove category name for affixation and casing + catst = A2OU(" ") + sTerm.copy(catpos); + sTerm = sTerm.copy(0, catpos); + sTerm = sTerm.trim(); + } + // generate synonyms with affixes + if (stem && stem2) + { + Reference< XSpellAlternatives > xTmpRes; + xTmpRes = xSpell->spell( A2OU("<?xml?><query type='generate'><word>") + + sTerm + A2OU("</word>") + codeTerm + A2OU("</query>"), nLanguage, rProperties ); + if (xTmpRes.is()) + { + Sequence<OUString>seq = xTmpRes->getAlternatives(); + if (seq.getLength() > 0) + sTerm = seq[0]; + } + } + if (catpos2) + sTerm = catst2 + sTerm; + + sal_uInt16 ct1 = capitalType(sTerm, pCC); + if (CAPTYPE_MIXED == ct1) + ct = ct1; + OUString cTerm; + switch (ct) + { + case CAPTYPE_ALLCAP: + cTerm = makeUpperCase(sTerm, pCC); + break; + case CAPTYPE_INITCAP: + cTerm = makeInitCap(sTerm, pCC); + break; + default: + cTerm = sTerm; + break; + } + OUString aAlt( cTerm + catst); + pStr[i] = aAlt; + } #if 0 - Meaning * pMn = new Meaning(rTerm,nLanguage,rHelper); + Meaning * pMn = new Meaning(rTerm,nLanguage,rHelper); #endif - Meaning * pMn = new Meaning(rTerm,nLanguage); - OUString dTerm(pe->defn,strlen(pe->defn),aEnc ); - pMn->SetMeaning(dTerm); - pMn->SetSynonyms(aStr); - Reference<XMeaning>* pMeaning = aMeanings.getArray(); - pMeaning[j] = pMn; - } - pe++; - } - pTH->CleanUpAfterLookup(&pmean,nmean); - - if (nmean) { + Meaning * pMn = new Meaning(rTerm,nLanguage); + OUString dTerm(pe->defn,strlen(pe->defn),eEnc ); + pMn->SetMeaning(dTerm); + pMn->SetSynonyms(aStr); + Reference<XMeaning>* pMeaning = aMeanings.getArray(); + pMeaning[j] = pMn; + } + pe++; + } + pTH->CleanUpAfterLookup(&pmean,nmean); + + if (nmean) + { prevTerm = qTerm; prevMeanings = aMeanings; prevLocale = nLanguage; return aMeanings; - } + } - if (stem || !xLngSvcMgr.is()) return noMeanings; + if (stem || !xLngSvcMgr.is()) + return noMeanings; stem = 1; xSpell = uno::Reference< XSpellChecker1 >( xLngSvcMgr->getSpellChecker(), UNO_QUERY ); - if (!xSpell.is() || !xSpell->isValid( A2OU(SPELLML_SUPPORT), nLanguage, rProperties )) { + if (!xSpell.is() || !xSpell->isValid( A2OU(SPELLML_SUPPORT), nLanguage, rProperties )) return noMeanings; - } Reference< XSpellAlternatives > xTmpRes; xTmpRes = xSpell->spell( A2OU("<?xml?><query type='stem'><word>") + rTerm + A2OU("</word></query>"), nLanguage, rProperties ); - if (xTmpRes.is()) { + if (xTmpRes.is()) + { Sequence<OUString>seq = xTmpRes->getAlternatives(); #if 0 - for (int i = 0; i < seq.getLength(); i++) { - OString o = OUStringToOString(seq[i], rtl_getTextEncodingFromUnixCharset("UTF-8")); + for (int i = 0; i < seq.getLength(); i++) + { + OString o = OUStringToOString(seq[i], RTL_TEXTENCODING_UTF8); fprintf(stderr, "%d: %s\n", i + 1, o.pData->buffer); } #endif - if (seq.getLength() > 0) { + if (seq.getLength() > 0) + { rTerm = seq[0]; // XXX Use only the first stem continue; } @@ -529,17 +540,21 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL // stem the last word of the synonym (for categories after affixation) rTerm = rTerm.trim(); sal_Int32 pos = rTerm.lastIndexOf(' '); - if (!pos) return noMeanings; + if (!pos) + return noMeanings; xTmpRes = xSpell->spell( A2OU("<?xml?><query type='stem'><word>") + rTerm.copy(pos + 1) + A2OU("</word></query>"), nLanguage, rProperties ); - if (xTmpRes.is()) { + if (xTmpRes.is()) + { Sequence<OUString>seq = xTmpRes->getAlternatives(); - if (seq.getLength() > 0) { + if (seq.getLength() > 0) + { pTerm = rTerm.copy(pos + 1); rTerm = rTerm.copy(0, pos + 1) + seq[0]; -#if 0 - for (int i = 0; i < seq.getLength(); i++) { - OString o = OUStringToOString(seq[i], rtl_getTextEncodingFromUnixCharset("UTF-8")); +#if 0 + for (int i = 0; i < seq.getLength(); i++) + { + OString o = OUStringToOString(seq[i], RTL_TEXTENCODING_UTF8); fprintf(stderr, "%d: %s\n", i + 1, o.pData->buffer); } #endif @@ -547,12 +562,11 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL } } break; - } + } return noMeanings; } - Reference< XInterface > SAL_CALL Thesaurus_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ ) throw(Exception) @@ -562,8 +576,7 @@ Reference< XInterface > SAL_CALL Thesaurus_CreateInstance( } -OUString SAL_CALL - Thesaurus::getServiceDisplayName( const Locale& /*rLocale*/ ) +OUString SAL_CALL Thesaurus::getServiceDisplayName( const Locale& /*rLocale*/ ) throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -571,8 +584,7 @@ OUString SAL_CALL } -void SAL_CALL - Thesaurus::initialize( const Sequence< Any >& rArguments ) +void SAL_CALL Thesaurus::initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -603,24 +615,26 @@ void SAL_CALL sal_uInt16 SAL_CALL Thesaurus::capitalType(const OUString& aTerm, CharClass * pCC) { sal_Int32 tlen = aTerm.getLength(); - if ((pCC) && (tlen)) { - String aStr(aTerm); - sal_Int32 nc = 0; - for (USHORT tindex = 0; tindex < tlen; tindex++) { - if (pCC->getCharacterType(aStr,tindex) & - ::com::sun::star::i18n::KCharacterType::UPPER) nc++; - } - - if (nc == 0) return (sal_uInt16) CAPTYPE_NOCAP; - - if (nc == tlen) return (sal_uInt16) CAPTYPE_ALLCAP; + if ((pCC) && (tlen)) + { + String aStr(aTerm); + sal_Int32 nc = 0; + for (USHORT tindex = 0; tindex < tlen; tindex++) + { + if (pCC->getCharacterType(aStr,tindex) & + ::com::sun::star::i18n::KCharacterType::UPPER) nc++; + } - if ((nc == 1) && (pCC->getCharacterType(aStr,0) & - ::com::sun::star::i18n::KCharacterType::UPPER)) - return (sal_uInt16) CAPTYPE_INITCAP; + if (nc == 0) + return (sal_uInt16) CAPTYPE_NOCAP; + if (nc == tlen) + return (sal_uInt16) CAPTYPE_ALLCAP; + if ((nc == 1) && (pCC->getCharacterType(aStr,0) & + ::com::sun::star::i18n::KCharacterType::UPPER)) + return (sal_uInt16) CAPTYPE_INITCAP; - return (sal_uInt16) CAPTYPE_MIXED; - } + return (sal_uInt16) CAPTYPE_MIXED; + } return (sal_uInt16) CAPTYPE_UNKNOWN; } @@ -628,38 +642,40 @@ sal_uInt16 SAL_CALL Thesaurus::capitalType(const OUString& aTerm, CharClass * pC OUString SAL_CALL Thesaurus::makeLowerCase(const OUString& aTerm, CharClass * pCC) { - if (pCC) - return pCC->toLower_rtl(aTerm, 0, aTerm.getLength()); - return aTerm; + if (pCC) + return pCC->toLower_rtl(aTerm, 0, aTerm.getLength()); + return aTerm; } OUString SAL_CALL Thesaurus::makeUpperCase(const OUString& aTerm, CharClass * pCC) { - if (pCC) - return pCC->toUpper_rtl(aTerm, 0, aTerm.getLength()); - return aTerm; + if (pCC) + return pCC->toUpper_rtl(aTerm, 0, aTerm.getLength()); + return aTerm; } OUString SAL_CALL Thesaurus::makeInitCap(const OUString& aTerm, CharClass * pCC) { - sal_Int32 tlen = aTerm.getLength(); - if ((pCC) && (tlen)) { - OUString bTemp = aTerm.copy(0,1); - if (tlen > 1) - return ( pCC->toUpper_rtl(bTemp, 0, 1) - + pCC->toLower_rtl(aTerm,1,(tlen-1)) ); + sal_Int32 tlen = aTerm.getLength(); + if ((pCC) && (tlen)) + { + OUString bTemp = aTerm.copy(0,1); + if (tlen > 1) + { + return ( pCC->toUpper_rtl(bTemp, 0, 1) + + pCC->toLower_rtl(aTerm,1,(tlen-1)) ); + } - return pCC->toUpper_rtl(bTemp, 0, 1); + return pCC->toUpper_rtl(bTemp, 0, 1); } - return aTerm; + return aTerm; } -void SAL_CALL - Thesaurus::dispose() +void SAL_CALL Thesaurus::dispose() throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -673,8 +689,7 @@ void SAL_CALL } -void SAL_CALL - Thesaurus::addEventListener( const Reference< XEventListener >& rxListener ) +void SAL_CALL Thesaurus::addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -684,8 +699,7 @@ void SAL_CALL } -void SAL_CALL - Thesaurus::removeEventListener( const Reference< XEventListener >& rxListener ) +void SAL_CALL Thesaurus::removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -739,31 +753,6 @@ Sequence< OUString > Thesaurus::getSupportedServiceNames_Static() return aSNS; } - -sal_Bool SAL_CALL Thesaurus_writeInfo( - void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey ) -{ - try - { - String aImpl( '/' ); - aImpl += Thesaurus::getImplementationName_Static().getStr(); - aImpl.AppendAscii( "/UNO/SERVICES" ); - Reference< registry::XRegistryKey > xNewKey = - pRegistryKey->createKey( aImpl ); - Sequence< OUString > aServices = - Thesaurus::getSupportedServiceNames_Static(); - for( INT32 i = 0; i < aServices.getLength(); i++ ) - xNewKey->createKey( aServices.getConstArray()[i] ); - - return sal_True; - } - catch(Exception &) - { - return sal_False; - } -} - - void * SAL_CALL Thesaurus_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * ) { diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx index f0dde77ba..c717587bb 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx @@ -116,55 +116,27 @@ public: virtual ~Thesaurus(); // XSupportedLocales (for XThesaurus) - virtual Sequence< Locale > SAL_CALL - getLocales() - throw(RuntimeException); - virtual sal_Bool SAL_CALL - hasLocale( const Locale& rLocale ) - throw(RuntimeException); + virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException); + virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException); // XThesaurus - virtual Sequence< Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL - queryMeanings( const OUString& rTerm, const Locale& rLocale, - const PropertyValues& rProperties ) - throw(IllegalArgumentException, - RuntimeException); + virtual Sequence< Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL queryMeanings( const OUString& rTerm, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException); // XServiceDisplayName - virtual OUString SAL_CALL - getServiceDisplayName( const Locale& rLocale ) - throw(RuntimeException); + virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException); // XInitialization - virtual void SAL_CALL - initialize( const Sequence< Any >& rArguments ) - throw(Exception, RuntimeException); + virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException); // XComponent - virtual void SAL_CALL - dispose() - throw(RuntimeException); - virtual void SAL_CALL - addEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException); - virtual void SAL_CALL - removeEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException); - - //////////////////////////////////////////////////////////// - // Service specific part - // + virtual void SAL_CALL dispose() throw(RuntimeException); + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); // XServiceInfo - virtual OUString SAL_CALL - getImplementationName() - throw(RuntimeException); - virtual sal_Bool SAL_CALL - supportsService( const OUString& rServiceName ) - throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); static inline OUString @@ -183,8 +155,7 @@ private: static ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; */ - static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceManager > GetLngSvcMgr(); + static ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguServiceManager > GetLngSvcMgr(); }; diff --git a/lingucomponent/source/thesaurus/libnth/ntreg.cxx b/lingucomponent/source/thesaurus/libnth/ntreg.cxx index ffdca7377..71dbe7d08 100644 --- a/lingucomponent/source/thesaurus/libnth/ntreg.cxx +++ b/lingucomponent/source/thesaurus/libnth/ntreg.cxx @@ -41,9 +41,6 @@ using namespace com::sun::star::registry; // declaration of external RegEntry-functions defined by the service objects // -extern sal_Bool SAL_CALL Thesaurus_writeInfo( - void * /*pServiceManager*/, XRegistryKey * pRegistryKey ); - extern void * SAL_CALL Thesaurus_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, @@ -56,12 +53,6 @@ extern void * SAL_CALL Thesaurus_getFactory( extern "C" { -sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, XRegistryKey * pRegistryKey ) -{ - return Thesaurus_writeInfo( pServiceManager, pRegistryKey ); -} - void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { diff --git a/package/prj/d.lst b/package/prj/d.lst index 23966d0cf..919a1719a 100644 --- a/package/prj/d.lst +++ b/package/prj/d.lst @@ -3,3 +3,5 @@ ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\dtd\*.dtd %_DEST%\bin%_EXT%\*.* +..\%__SRC%\misc\package2.component %_DEST%\xml%_EXT%\package2.component +..\%__SRC%\misc\xstor.component %_DEST%\xml%_EXT%\xstor.component diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx index 5c393ec08..eeedeb7e5 100644 --- a/package/source/manifest/UnoRegister.cxx +++ b/package/source/manifest/UnoRegister.cxx @@ -46,43 +46,6 @@ using namespace ::com::sun::star::registry; using namespace ::com::sun::star::packages; using namespace ::com::sun::star::packages::manifest; -static sal_Bool writeInfo( void * pRegistryKey, - const OUString & rImplementationName, - Sequence< OUString > const & rServiceNames ) -{ - OUString aKeyName( OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); - - Reference< XRegistryKey > xKey; - try - { - xKey = static_cast< XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - return sal_False; - - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} // C functions to implement this as a component extern "C" void SAL_CALL component_getImplementationEnvironment( @@ -90,32 +53,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - -/** - * This function creates an implementation section in the registry and another subkey - * for each supported service. - * @param pServiceManager generic uno interface providing a service manager - * @param pRegistryKey generic uno interface providing registry key to write - */ -extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - return pRegistryKey && - writeInfo (pRegistryKey, - ManifestReader::static_getImplementationName(), - ManifestReader::static_getSupportedServiceNames() ) && - writeInfo (pRegistryKey, - ManifestWriter::static_getImplementationName(), - ManifestWriter::static_getSupportedServiceNames() ) && - writeInfo (pRegistryKey, - ZipPackage::static_getImplementationName(), - ZipPackage::static_getSupportedServiceNames() ) && - - writeInfo (pRegistryKey, - OZipFileAccess::impl_staticGetImplementationName(), - OZipFileAccess::impl_staticGetSupportedServiceNames() ); - -} - /** * This function is called to get service factories for an implementation. diff --git a/package/source/xstor/makefile.mk b/package/source/xstor/makefile.mk index 76494cb7d..5c381ba4c 100644 --- a/package/source/xstor/makefile.mk +++ b/package/source/xstor/makefile.mk @@ -73,3 +73,11 @@ DEF1EXPORTFILE=$(SHL1TARGET).dxp .INCLUDE : target.mk + +ALLTAR : $(MISC)/xstor.component + +$(MISC)/xstor.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + xstor.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt xstor.component diff --git a/package/source/xstor/register.cxx b/package/source/xstor/register.cxx index b0235f063..8eb4d7816 100644 --- a/package/source/xstor/register.cxx +++ b/package/source/xstor/register.cxx @@ -69,33 +69,5 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServic return pRet; } -sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) ); - - uno::Reference< registry::XRegistryKey > xNewKey; - - xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + - OStorageFactory::impl_staticGetImplementationName() + - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - - const uno::Sequence< ::rtl::OUString > aServices = OStorageFactory::impl_staticGetSupportedServiceNames(); - for( sal_Int32 ind = 0; ind < aServices.getLength(); ind++ ) - xNewKey->createKey( aServices.getConstArray()[ind] ); - - return sal_True; - } - catch (registry::InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - return sal_False; -} - } // extern "C" diff --git a/package/source/xstor/xstor.component b/package/source/xstor/xstor.component new file mode 100644 index 000000000..f338d6a54 --- /dev/null +++ b/package/source/xstor/xstor.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.embed.StorageFactory"> + <service name="com.sun.star.comp.embed.StorageFactory"/> + <service name="com.sun.star.embed.StorageFactory"/> + </implementation> +</component> diff --git a/package/source/xstor/xstor.dxp b/package/source/xstor/xstor.dxp index 9630d7e06..f0e1c6993 100644 --- a/package/source/xstor/xstor.dxp +++ b/package/source/xstor/xstor.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index f9b7816cb..ce4378609 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -1051,11 +1051,7 @@ void ZipFile::getSizeAndCRC( sal_Int32 nOffset, sal_Int32 nCompressedSize, sal_I nRealSize += nInBlock; } - if( aInflaterLocal.finished() ) - { - *nSize = nRealSize; - *nCRC = aCRC.getValue(); - } - else - *nSize = *nCRC = 0; + *nSize = nRealSize; + *nCRC = aCRC.getValue(); } + diff --git a/package/util/exports.dxp b/package/util/exports.dxp index 9630d7e06..f0e1c6993 100644 --- a/package/util/exports.dxp +++ b/package/util/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/package/util/makefile.mk b/package/util/makefile.mk index 20732c102..344b2cf13 100644 --- a/package/util/makefile.mk +++ b/package/util/makefile.mk @@ -75,3 +75,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk + +ALLTAR : $(MISC)/package2.component + +$(MISC)/package2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + package2.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt package2.component diff --git a/package/util/package2.component b/package/util/package2.component new file mode 100644 index 000000000..cdfa842d0 --- /dev/null +++ b/package/util/package2.component @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.package.zip.ZipFileAccess"> + <service name="com.sun.star.comp.packages.zip.ZipFileAccess"/> + <service name="com.sun.star.packages.zip.ZipFileAccess"/> + </implementation> + <implementation name="com.sun.star.packages.comp.ZipPackage"> + <service name="com.sun.star.packages.Package"/> + </implementation> + <implementation name="com.sun.star.packages.manifest.comp.ManifestReader"> + <service name="com.sun.star.packages.manifest.ManifestReader"/> + </implementation> + <implementation name="com.sun.star.packages.manifest.comp.ManifestWriter"> + <service name="com.sun.star.packages.manifest.ManifestWriter"/> + </implementation> +</component> diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl index 62a94fb3b..d90c76650 100644 --- a/setup_native/scripts/admin.pl +++ b/setup_native/scripts/admin.pl @@ -66,7 +66,6 @@ sub usage { print <<Ende; ---------------------------------------------------------------------- -$prog V1.0 (c) Sun Microsystems 2009 This program installs a Windows Installer installation set without using msiexec.exe. The installation is comparable with an administrative installation using the Windows Installer @@ -298,6 +297,69 @@ sub get_sourcepath_from_filename_and_includepath return \$onefile; } +############################################################## +# Removing all empty directories below a specified directory +############################################################## + +sub remove_empty_dirs_in_folder +{ + my ( $dir, $firstrun ) = @_; + + if ( $firstrun ) + { + print "Removing superfluous directories\n"; + } + + my @content = (); + + $dir =~ s/\Q$separator\E\s*$//; + + if ( -d $dir ) + { + opendir(DIR, $dir); + @content = readdir(DIR); + closedir(DIR); + + my $oneitem; + + foreach $oneitem (@content) + { + if ((!($oneitem eq ".")) && (!($oneitem eq ".."))) + { + my $item = $dir . $separator . $oneitem; + + if ( -d $item ) # recursive + { + remove_empty_dirs_in_folder($item, 0); + } + } + } + + # try to remove empty directory + my $returnvalue = rmdir $dir; + + # if ( $returnvalue ) { print "Successfully removed empty dir $dir\n"; } + } +} + +#################################################### +# Detecting the directory with extensions +#################################################### + +sub get_extensions_dir +{ + my ( $unopkgfile ) = @_; + + my $localbranddir = $unopkgfile; + get_path_from_fullqualifiedname(\$localbranddir); # "program" dir in brand layer + get_path_from_fullqualifiedname(\$localbranddir); # root dir in brand layer + $localbranddir =~ s/\Q$separator\E\s*$//; + my $extensiondir = $localbranddir . $separator . "share" . $separator . "extensions"; + my $preregdir = $localbranddir . $separator . "share" . $separator . "prereg" . $separator . "bundled"; + + return ($extensiondir, $preregdir); +} + ######################################################## # Finding all files with a specified file extension # in a specified directory. @@ -784,6 +846,12 @@ sub create_directory_structure my @startparents = ("TARGETDIR", "INSTALLLOCATION"); foreach $dir (@startparents) { create_directory_tree($dir, \%fullpathhash, $targetdir, $dirhash); } + + # Also adding the pathes of the startparents + foreach $dir (@startparents) + { + if ( ! exists($fullpathhash{$dir}) ) { $fullpathhash{$dir} = $targetdir; } + } return \%fullpathhash; } @@ -874,7 +942,6 @@ sub copy_files_into_directory_structure print "Copying files\n"; my $unopkgfile = ""; - my @extensions = (); for ( my $i = 1; $i <= $maxsequence; $i++ ) { @@ -917,8 +984,6 @@ sub copy_files_into_directory_structure if ( ! $copyreturn) { exit_program("ERROR: Could not copy $source to $dest\n"); } - # Collecting all extensions - if ( $destfile =~ /\.oxt\s*$/ ) { push(@extensions, $destfile); } # Searching unopkg.exe if ( $destfile =~ /unopkg\.exe\s*$/ ) { $unopkgfile = $destfile; } # if (( $^O =~ /cygwin/i ) && ( $destfile =~ /\.exe\s*$/ )) { change_privileges($destfile, "775"); } @@ -929,7 +994,7 @@ sub copy_files_into_directory_structure # } } - return ($unopkgfile, \@extensions); + return ($unopkgfile); } ###################################################### @@ -1020,12 +1085,19 @@ sub get_temppath } #################################################################################### -# Registering one extension +# Registering extensions #################################################################################### -sub register_one_extension +sub register_extensions_sync { - my ($unopkgfile, $extension, $temppath) = @_; + my ($unopkgfile, $localtemppath, $preregdir) = @_; + + if ( $preregdir eq "" ) + { + my $logtext = "ERROR: Failed to determine \"prereg\" folder for extension registration! Please check your installation set."; + print $logtext . "\n"; + exit_program($logtext); + } my $from = cwd(); @@ -1045,22 +1117,17 @@ sub register_one_extension $path_displayed = 1; } - $temppath =~ s/\\/\//g; - $temppath = "/".$temppath; - - # Converting path of $extension for cygwin - - my $localextension = $extension; - if ( $^O =~ /cygwin/i ) { - $localextension = qx{cygpath -w "$extension"}; - $localextension =~ s/\\/\\\\/g; - } + $localtemppath =~ s/\\/\//g; if ( $^O =~ /cygwin/i ) { $executable = "./" . $executable; + $preregdir = qx{cygpath -m "$preregdir"}; + chomp($preregdir); } - my $systemcall = $executable . " add --shared --verbose --suppress-license " . "\"" . $localextension . "\"" . " -env:UserInstallation=file://" . $temppath . " 2\>\&1 |"; + $preregdir =~ s/\/\s*$//g; + + my $systemcall = $executable . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file:///" . $preregdir . "\"" . " -env:UserInstallation=file:///" . $localtemppath . " 2\>\&1 |"; print "... $systemcall\n"; @@ -1088,26 +1155,20 @@ sub register_one_extension sub register_extensions { - my ($unopkgfile, $extensions, $temppath) = @_; + my ($unopkgfile, $temppath, $preregdir) = @_; - if ( $#{$extensions} > -1 ) - { - print "Registering extensions:\n"; + print "Registering extensions:\n"; - if (( ! -f $unopkgfile ) || ( $unopkgfile eq "" )) - { - print("WARNING: Could not find unopkg.exe (Language Pack?)!\n"); - } - else - { - foreach $extension ( @{$extensions} ) { register_one_extension($unopkgfile, $extension, $temppath); } - remove_complete_directory($temppath, 1) - } + if (( ! -f $unopkgfile ) || ( $unopkgfile eq "" )) + { + print("WARNING: Could not find unopkg.exe (Language Pack?)!\n"); } else { - print "No extensions to register.\n"; + register_extensions_sync($unopkgfile, $temppath, $preregdir); + remove_complete_directory($temppath, 1); } + } #################################################################################### @@ -1351,7 +1412,7 @@ my ( $filehash, $fileorder, $maxsequence ) = analyze_file_file($filecontent); my $fullpathhash = create_directory_structure($dirhash, $targetdir); # Copying files -my ($unopkgfile, $extensions) = copy_files_into_directory_structure($fileorder, $filehash, $componenthash, $fullpathhash, $maxsequence, $unpackdir, $installdir, $dirhash); +my ($unopkgfile) = copy_files_into_directory_structure($fileorder, $filehash, $componenthash, $fullpathhash, $maxsequence, $unpackdir, $installdir, $dirhash); if ( $^O =~ /cygwin/i ) { change_privileges_full($targetdir); } my $msidatabase = $targetdir . $separator . $databasefilename; @@ -1363,10 +1424,14 @@ $filename = $helperdir . $separator . "CustomAction.idt"; $filecontent = read_file($filename); my $register_extensions_exists = analyze_customaction_file($filecontent); +# Removing empty dirs in extension folder +my ( $extensionfolder, $preregdir ) = get_extensions_dir($unopkgfile); +if ( -d $extensionfolder ) { remove_empty_dirs_in_folder($extensionfolder, 1); } + if ( $register_extensions_exists ) { # Registering extensions - register_extensions($unopkgfile, $extensions, $temppath); + register_extensions($unopkgfile, $temppath, $preregdir); } # Saving info in Summary Information Stream of msi database (required for following patches) diff --git a/setup_native/scripts/install_linux.sh b/setup_native/scripts/install_linux.sh index 955a185ac..12801b62f 100644 --- a/setup_native/scripts/install_linux.sh +++ b/setup_native/scripts/install_linux.sh @@ -121,6 +121,14 @@ then exit 2 fi +# #163256# check if we are on a debian system... +if rpm --help | grep debian >/dev/null; +then + DEBIAN_FLAGS="--force-debian --nodeps" +else + DEBIAN_FLAGS= +fi + # # Determine whether this should be an update or a fresh install # @@ -227,7 +235,7 @@ FAKEDBRPM=/tmp/fake-db-1.0-$$.noarch.rpm linenum=??? tail -n +$linenum $0 > $FAKEDBRPM -rpm --upgrade --ignoresize --dbpath $RPM_DB_PATH $FAKEDBRPM +rpm ${DEBIAN_FLAGS} --upgrade --ignoresize --dbpath $RPM_DB_PATH $FAKEDBRPM rm -f $FAKEDBRPM @@ -253,7 +261,7 @@ echo "Installing the RPMs" ABSROOT=`cd ${INSTALLDIR}; pwd` RELOCATIONS=`rpm -qp --qf "--relocate %{PREFIXES}=${ABSROOT}%{PREFIXES} \n" $RPMLIST | sort -u | tr -d "\012"` -UserInstallation=\$BRAND_BASE_DIR/../UserInstallation rpm $RPMCMD --ignoresize -vh $RELOCATIONS --dbpath $RPM_DB_PATH $RPMLIST +UserInstallation=\$BRAND_BASE_DIR/../UserInstallation rpm ${DEBIAN_FLAGS} $RPMCMD --ignoresize -vh $RELOCATIONS --dbpath $RPM_DB_PATH $RPMLIST # # Create a link into the users home directory @@ -268,11 +276,11 @@ if [ "$UPDATE" = "yes" -a ! -f $INSTALLDIR/program/bootstraprc ] then echo echo "Update failed due to a bug in RPM, uninstalling .." - rpm --erase -v --nodeps --dbpath $RPM_DB_PATH `rpm --query --queryformat "%{NAME} " --package $RPMLIST --dbpath $RPM_DB_PATH` + rpm ${DEBIAN_FLAGS} --erase -v --nodeps --dbpath $RPM_DB_PATH `rpm --query --queryformat "%{NAME} " --package $RPMLIST --dbpath $RPM_DB_PATH` echo echo "Now re-installing new packages .." echo - rpm --install --nodeps --ignoresize -vh $RELOCATIONS --dbpath $RPM_DB_PATH $RPMLIST + rpm ${DEBIAN_FLAGS} --install --nodeps --ignoresize -vh $RELOCATIONS --dbpath $RPM_DB_PATH $RPMLIST echo fi diff --git a/setup_native/source/java/javaversion.dat b/setup_native/source/java/javaversion.dat index a629a4037..a647694a7 100755 --- a/setup_native/source/java/javaversion.dat +++ b/setup_native/source/java/javaversion.dat @@ -26,30 +26,30 @@ #************************************************************************* # GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})") -JAVAVERSION=Java 6 Update 20 -WINDOWSJAVAVERSION=Java 6 Update 20 +JAVAVERSION=Java 6 Update 22 +WINDOWSJAVAVERSION=Java 6 Update 22 # Windows (scp2 and downloadtemplate.nsi) -WINDOWSJAVAFILENAME=jre-6u20-windows-i586.exe -WINDOWSJAVAREGISTRYENTRY=1.6.0_20 +WINDOWSJAVAFILENAME=jre-6u22-windows-i586.exe +WINDOWSJAVAREGISTRYENTRY=1.6.0_22 # Linux (scp2) -LINUXJAVAFILENAME=jre-6u20-linux-i586.rpm +LINUXJAVAFILENAME=jre-6u22-linux-i586.rpm # Linux (rpmUnit.xml, rpm -qp <filename> ) -LINUXJAVANAME=jre-1.6.0_20-fcs +LINUXJAVANAME=jre-1.6.0_22-fcs # Linux-x64 (scp2) -LINUXX64JAVAFILENAME=jre-6u20-linux-amd64.rpm +LINUXX64JAVAFILENAME=jre-6u22-linux-amd64.rpm # Solaris Sparc (scp2) -SOLSJAVARTPACKED=SUNWj6rt_1_6_0_20_sparc.tar.gz -SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_20_sparc.tar.gz -SOLSJAVAMANPACKED=SUNWj6man_1_6_0_20_sparc.tar.gz +SOLSJAVARTPACKED=SUNWj6rt_1_6_0_22_sparc.tar.gz +SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_22_sparc.tar.gz +SOLSJAVAMANPACKED=SUNWj6man_1_6_0_22_sparc.tar.gz # Solaris x86 (scp2) -SOLIJAVARTPACKED=SUNWj6rt_1_6_0_20_x86.tar.gz -SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_20_x86.tar.gz -SOLIJAVAMANPACKED=SUNWj6man_1_6_0_20_x86.tar.gz +SOLIJAVARTPACKED=SUNWj6rt_1_6_0_22_x86.tar.gz +SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_22_x86.tar.gz +SOLIJAVAMANPACKED=SUNWj6man_1_6_0_22_x86.tar.gz # Solaris (pkgUnit.xml, needs only to be changed in major changes) SOLARISJAVART=SUNWj6rt diff --git a/setup_native/source/java/javaversion2.dat b/setup_native/source/java/javaversion2.dat index a629a4037..a647694a7 100644 --- a/setup_native/source/java/javaversion2.dat +++ b/setup_native/source/java/javaversion2.dat @@ -26,30 +26,30 @@ #************************************************************************* # GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})") -JAVAVERSION=Java 6 Update 20 -WINDOWSJAVAVERSION=Java 6 Update 20 +JAVAVERSION=Java 6 Update 22 +WINDOWSJAVAVERSION=Java 6 Update 22 # Windows (scp2 and downloadtemplate.nsi) -WINDOWSJAVAFILENAME=jre-6u20-windows-i586.exe -WINDOWSJAVAREGISTRYENTRY=1.6.0_20 +WINDOWSJAVAFILENAME=jre-6u22-windows-i586.exe +WINDOWSJAVAREGISTRYENTRY=1.6.0_22 # Linux (scp2) -LINUXJAVAFILENAME=jre-6u20-linux-i586.rpm +LINUXJAVAFILENAME=jre-6u22-linux-i586.rpm # Linux (rpmUnit.xml, rpm -qp <filename> ) -LINUXJAVANAME=jre-1.6.0_20-fcs +LINUXJAVANAME=jre-1.6.0_22-fcs # Linux-x64 (scp2) -LINUXX64JAVAFILENAME=jre-6u20-linux-amd64.rpm +LINUXX64JAVAFILENAME=jre-6u22-linux-amd64.rpm # Solaris Sparc (scp2) -SOLSJAVARTPACKED=SUNWj6rt_1_6_0_20_sparc.tar.gz -SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_20_sparc.tar.gz -SOLSJAVAMANPACKED=SUNWj6man_1_6_0_20_sparc.tar.gz +SOLSJAVARTPACKED=SUNWj6rt_1_6_0_22_sparc.tar.gz +SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_22_sparc.tar.gz +SOLSJAVAMANPACKED=SUNWj6man_1_6_0_22_sparc.tar.gz # Solaris x86 (scp2) -SOLIJAVARTPACKED=SUNWj6rt_1_6_0_20_x86.tar.gz -SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_20_x86.tar.gz -SOLIJAVAMANPACKED=SUNWj6man_1_6_0_20_x86.tar.gz +SOLIJAVARTPACKED=SUNWj6rt_1_6_0_22_x86.tar.gz +SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_22_x86.tar.gz +SOLIJAVAMANPACKED=SUNWj6man_1_6_0_22_x86.tar.gz # Solaris (pkgUnit.xml, needs only to be changed in major changes) SOLARISJAVART=SUNWj6rt diff --git a/setup_native/source/mac/broffice/DS_Store b/setup_native/source/mac/broffice/DS_Store Binary files differindex 06aad72c9..b0407ef50 100644 --- a/setup_native/source/mac/broffice/DS_Store +++ b/setup_native/source/mac/broffice/DS_Store diff --git a/setup_native/source/mac/ooo/DS_Store b/setup_native/source/mac/ooo/DS_Store Binary files differindex 632e6aff9..e722b546e 100644 --- a/setup_native/source/mac/ooo/DS_Store +++ b/setup_native/source/mac/ooo/DS_Store diff --git a/setup_native/source/mac/ooo/DS_Store_Langpack b/setup_native/source/mac/ooo/DS_Store_Langpack Binary files differindex 1b53eba75..3a8ad71a5 100644 --- a/setup_native/source/mac/ooo/DS_Store_Langpack +++ b/setup_native/source/mac/ooo/DS_Store_Langpack diff --git a/setup_native/source/packinfo/package.txt b/setup_native/source/packinfo/package.txt new file mode 100644 index 000000000..4ec319646 --- /dev/null +++ b/setup_native/source/packinfo/package.txt @@ -0,0 +1 @@ +DO NOT DELETE THIS FILE
\ No newline at end of file diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index 903e1834e..fb04b347f 100755 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -477,6 +477,7 @@ End Start module = "gid_Module_Root_Extension_Oooimprovement" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-oooimprovement" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-oooimprovement" @@ -492,6 +493,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Af" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-af" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-af" @@ -507,6 +509,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Ca" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ca" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ca" @@ -522,6 +525,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Cs" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-cs" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-cs" @@ -537,6 +541,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Da" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-da" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-da" @@ -552,6 +557,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_De_AT" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-de-AT" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-de-AT" @@ -567,6 +573,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_De_CH" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-de-CH" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-de-CH" @@ -582,6 +589,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_De_DE" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-de-DE" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-de-DE" @@ -597,6 +605,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_En" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-en" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-en" @@ -612,6 +621,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Es" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-es" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-es" @@ -627,6 +637,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Et" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-et" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-et" @@ -642,6 +653,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Fr" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-fr" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-fr" @@ -657,6 +669,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Gl" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-gl" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-dict-gl" @@ -672,6 +685,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_He" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-he" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-he" @@ -687,6 +701,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Hu" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-hu" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-hu" @@ -702,6 +717,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_It" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-it" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-it" @@ -717,6 +733,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Ku_Tr" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ku-TR" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION" packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ku-TR" @@ -732,6 +749,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Lt" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-lt" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-lt" @@ -747,6 +765,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Ne" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ne" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ne" @@ -762,6 +781,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Nl" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-nl" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-nl" @@ -777,6 +797,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_No" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-no" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-no" @@ -792,6 +813,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Pl" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-pl" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-pl" @@ -807,6 +829,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Pt" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-pt" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-pt" @@ -822,6 +845,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Ro" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ro" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ro" @@ -837,6 +861,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Ru" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ru" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ru" @@ -852,6 +877,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Sk" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sk" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sk" @@ -867,6 +893,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Sl" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sl" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sl" @@ -882,6 +909,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Sr" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sr" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sr" @@ -897,6 +925,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Sv" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sv" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sv" @@ -912,6 +941,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Sw" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sw" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sw" @@ -927,6 +957,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Th" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-th" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-th" @@ -942,6 +973,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Vi" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-vi" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-dict-vi" @@ -957,6 +989,7 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Zu" +script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-zu" solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-zu" diff --git a/setup_native/source/packinfo/shellscripts_extensions.txt b/setup_native/source/packinfo/shellscripts_extensions.txt index 424962e3d..c73e7fae5 100755 --- a/setup_native/source/packinfo/shellscripts_extensions.txt +++ b/setup_native/source/packinfo/shellscripts_extensions.txt @@ -27,7 +27,7 @@ fi # DISKLESS_SRVC=`echo $$BASEDIR | /usr/bin/grep export/Solaris_[1-9][0-9]/usr_$${ARCH}.all` if [ "$$DISKLESS_SRVC" ]; then - UNOPKG=/export/Solaris_11/usr_`uname -p`.all/opt/staroffice9/program/unopkg + UNOPKG=/export/Solaris_11/usr_`uname -p`.allPRODUCTDIRECTORYNAME/program/unopkg POSTRUN=$$PKG_INSTALL_ROOT/usr_`uname -p`.all/usr/lib/postrun CLIENT_BASEDIR=$$PKG_INSTALL_ROOT/usr_$${ARCH}.all else @@ -38,18 +38,20 @@ fi if [ -x $$POSTRUN ]; then ( echo "test -x \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" || exit 0" echo "umask 022" - echo "\"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" add --shared --suppress-license --bundled \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}\" \"-env:UserInstallation=file:////$$INSTDIR\" '-env:UNO_JAVA_JFW_INSTALL_DATA=\$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'" + echo "\"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" sync \"-env:BUNDLED_EXTENSIONS_USER=file:////$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled\" \"-env:UserInstallation=file:////$$INSTDIR\" '-env:UNO_JAVA_JFW_INSTALL_DATA=\$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'" + echo "find \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled\" -type f -exec chmod 644 {} \\;" ) | $$POSTRUN -b -c UNOPKG if [ "$$?" != "0" ]; then - echo "\nERROR: Installation of UNO extension ${OXTFILENAME}" + echo "\nERROR: Installation of UNO extensions" echo " through $$POSTRUN failed." exit 1 fi else # No postrun available, try running unopkg directly - "$$UNOPKG" add --shared --suppress-license --bundled "$$BASEDIR/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + "$$UNOPKG" sync "-env:BUNDLED_EXTENSIONS_USER=file:////////$$BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled" "-env:UserInstallation=file:////////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + find "$$BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \; if [ "$$?" != "0" ]; then - echo "\nERROR: Installation of UNO extension ${OXTFILENAME} failed." + echo "\nERROR: Installation of UNO extensions failed." test "$$BASEDIR" = "$$CLIENT_BASEDIR" || echo "ERROR: alternate root install requires SUNWpostrun package to be installed" echo 'ERROR: Make sure the runtime requirements (operating system, patch level, architecture) are met.' exit 1 @@ -63,7 +65,8 @@ fi exit 0 END -%preremove << END +%postremove << END + if [ -n "$$TMPDIR" ]; then UNOPKGTMP="$$TMPDIR" elif [ -n "$$TMP" ]; then @@ -89,15 +92,17 @@ if [ -x $$PKG_INSTALL_ROOT/usr/lib/postrun ]; then ( echo "test -x \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" || exit 0" echo "cd \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program\"" echo "umask 022" - echo "\"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" remove --shared --bundled \"${OXTFILENAME}\" \"-env:UserInstallation=file:////$$INSTDIR\" '-env:UNO_JAVA_JFW_INSTALL_DATA=\$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'" + echo "\"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" sync \"-env:BUNDLED_EXTENSIONS_USER=file:////$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled\" \"-env:UserInstallation=file:////$$INSTDIR\" '-env:UNO_JAVA_JFW_INSTALL_DATA=\$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'" + echo "find \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled\" -type f -exec chmod 644 {} \\;" echo "rm -rf \"$$INSTDIR\"" ) | $$PKG_INSTALL_ROOT/usr/lib/postrun -c UNOPKG else # No postrun available, try running unopkg directly test -x $$BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg || exit 0 - "$$BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg" remove --shared --bundled "${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + "$$BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg" sync "-env:BUNDLED_EXTENSIONS_USER=file:////////$$BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled" "-env:UserInstallation=file:////////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + echo "find \"$$BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled\" -type f -exec chmod 644 {} \\;" if [ "$$?" != "0" ]; then - echo "\nERROR: Removal of UNO extension ${OXTFILENAME} failed." + echo "\nERROR: Removal of UNO extension failed." test "$$BASEDIR" = "$$CLIENT_BASEDIR" || echo "ERROR: alternate root uninstall requires SUNWpostrun package to be installed" echo 'ERROR: Make sure the runtime requirements (operating system, patch level, architecture) are met.' exit 1 @@ -115,44 +120,6 @@ END %format rpm -# As remove does not need the oxt file, this could potentially -# be done in the postinstall script as well. -%preinstall << END -# if this is an update, remove the old package instance first -test "$$1" = "2" || exit 0 - -#Find the temp dir -if [ -n "$$TMPDIR" ]; then - UNOPKGTMP="$$TMPDIR" -elif [ -n "$$TMP" ]; then - UNOPKGTMP="$$TMP" -elif [ -d "/tmp" ]; then - UNOPKGTMP="/tmp" -else - echo "No tmp directory found!" - exit 1 -fi - -#Create the command which creates a temporary directory -if [ -x "/bin/mktemp" ] -then - INSTDIR=`/bin/mktemp -d "$${UNOPKGTMP}/userinstall.XXXXXX"` -else - INSTDIR="$${UNOPKGTMP}/userinstall.$$$$" - mkdir "$$INSTDIR" -fi - -if [ -x "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" ]; then - "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" remove --shared --bundled "${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' -fi - -if [ -n "$$INSTDIR" ]; then - rm -rf "$$INSTDIR" -fi - -exit 0 -END - %postinstall << END #Find the temp dir if [ -n "$$TMPDIR" ]; then @@ -176,7 +143,8 @@ else fi if [ -x "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" ]; then - "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" add --shared --suppress-license --shared "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}" "-env:UserInstallation=file://////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" sync "-env:BUNDLED_EXTENSIONS_USER=file:////$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/share/prereg/bundled" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + find "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \; fi if [ -n "$$INSTDIR" ]; then @@ -185,13 +153,9 @@ fi exit 0 - END -%preremove << END -# if this is an update, just do nothing -test "$$1" = "0" || exit 0 - +%postremove << END #Find the temp dir if [ -n "$$TMPDIR" ]; then UNOPKGTMP="$$TMPDIR" @@ -214,7 +178,8 @@ else fi if [ -x "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" ]; then - "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" remove --shared --bundled "${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" sync "-env:BUNDLED_EXTENSIONS_USER=file:////$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/share/prereg/bundled" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + find "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \; fi if [ -n "$$INSTDIR" ]; then @@ -226,53 +191,6 @@ END %format deb -# As remove does not need the oxt file, this could potentially -# be done in the postinstall script as well. -%preinstall << END -# if this is an update, remove the old package instance first -if [ "$$1" != "upgrade" ] -then - exit 0 -fi - -#Find the temp dir -if [ -n "$$TMPDIR" ] -then - UNOPKGTMP="$$TMPDIR" -elif [ -n "$$TMP" ] -then - UNOPKGTMP="$$TMP" -elif [ -d "/tmp" ] -then - UNOPKGTMP="/tmp" -else - echo "No tmp directory found!" - exit 1 -fi - - -#Create the command which creates a temporary directory -if [ -x "/bin/mktemp" ] -then - INSTDIR=`/bin/mktemp -d "$${UNOPKGTMP}/userinstall.XXXXXX"` -else - INSTDIR="$${UNOPKGTMP}/userinstall.$$$$" - mkdir "$$INSTDIR" -fi - -if [ -x "PRODUCTDIRECTORYNAME/program/unopkg" ] -then - "PRODUCTDIRECTORYNAME/program/unopkg" remove --shared --bundled "${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' -fi - -if [ -n "$$INSTDIR" ] -then - rm -rf "$$INSTDIR" -fi - -exit 0 -END - %postinstall << END #Find the temp dir if [ -n "$$TMPDIR" ] @@ -299,7 +217,8 @@ else fi if [ -x "PRODUCTDIRECTORYNAME/program/unopkg" ]; then - "PRODUCTDIRECTORYNAME/program/unopkg" add --shared --suppress-license --bundled "PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}" "-env:UserInstallation=file://////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + "PRODUCTDIRECTORYNAME/program/unopkg" sync "-env:BUNDLED_EXTENSIONS_USER=file://////PRODUCTDIRECTORYNAME/share/prereg/bundled" "-env:UserInstallation=file://////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + find "PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \; fi if [ -n "$$INSTDIR" ] @@ -309,18 +228,10 @@ fi exit 0 - END -%preremove << END -# if this is an update, just do nothing - -if [ "$$1" = "upgrade" ] -then - exit 0 -fi - -#Find the temp dir +%postremove << END +# Find the temp dir if [ -n "$$TMPDIR" ] then UNOPKGTMP="$$TMPDIR" @@ -346,7 +257,8 @@ fi if [ -x "PRODUCTDIRECTORYNAME/program/unopkg" ] then - "PRODUCTDIRECTORYNAME/program/unopkg" remove --shared --bundled "${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + "PRODUCTDIRECTORYNAME/program/unopkg" sync "-env:BUNDLED_EXTENSIONS_USER=file://////PRODUCTDIRECTORYNAME/share/prereg/bundled" "-env:UserInstallation=file://////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + find "PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \; fi if [ -n "$$INSTDIR" ] diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt index 8d5cb0fc8..5853a97b1 100644 --- a/setup_native/source/packinfo/spellchecker_selection.txt +++ b/setup_native/source/packinfo/spellchecker_selection.txt @@ -44,6 +44,7 @@ sr = "sr,en-US" sh = "sr,en-US" sw = "sw,en-US" th = "th,en-US" +uk = "ru,en-US" vi = "vi,en-US,fr" zh-TW = "EMPTY,en-US" zh-CN = "EMPTY,en-US" diff --git a/setup_native/source/win32/customactions/languagepacks/exports.dxp b/setup_native/source/win32/customactions/languagepacks/exports.dxp index d01befd5d..c098a38d5 100644 --- a/setup_native/source/win32/customactions/languagepacks/exports.dxp +++ b/setup_native/source/win32/customactions/languagepacks/exports.dxp @@ -2,3 +2,5 @@ SetProductInstallationPath RegisterLanguagePack GetUserInstallMode IsOfficeRunning +RegisterExtensions + diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk index 69526077c..8da47ab1c 100644 --- a/setup_native/source/win32/customactions/languagepacks/makefile.mk +++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk @@ -77,6 +77,7 @@ STDSHL+= \ #SHL1LIBS = $(SLB)$/$(TARGET).lib SHL1OBJS = $(SLOFILES) \ + $(SLO)$/registerextensions.obj \ $(SLO)$/seterror.obj SHL1TARGET = $(TARGET) diff --git a/setup_native/source/win32/customactions/patch/exports.dxp b/setup_native/source/win32/customactions/patch/exports.dxp index b57f2838b..dd5eb4dcf 100755 --- a/setup_native/source/win32/customactions/patch/exports.dxp +++ b/setup_native/source/win32/customactions/patch/exports.dxp @@ -7,3 +7,5 @@ IsOfficeRunning SetFeatureState SetNewFeatureState ShowOnlineUpdateDialog +RegisterExtensions +RemoveExtensions diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk index cb8733de2..577053892 100755 --- a/setup_native/source/win32/customactions/patch/makefile.mk +++ b/setup_native/source/win32/customactions/patch/makefile.mk @@ -76,6 +76,7 @@ SHL1OBJS = $(SLOFILES) \ $(SLO)$/shutdown_quickstart.obj \ $(SLO)$/quickstarter.obj \ $(SLO)$/upgrade.obj \ + $(SLO)$/registerextensions.obj \ $(SLO)$/seterror.obj SHL1TARGET = $(TARGET) diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx index aea7610b7..4c06be2ed 100644..100755 --- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx +++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx @@ -116,14 +116,43 @@ static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey ) { // We will replace registration for word pad bRet = true; } - if ( strncmp( szBuffer, "OpenOffice.org.", 15 ) == 0 ) + else if ( strncmp( szBuffer, "OpenOffice.org.", 15 ) == 0 ) { // We will replace registration for our own types, too bRet = true; } - if ( strncmp( szBuffer, "ooostub.", 8 ) == 0 ) + else if ( strncmp( szBuffer, "ooostub.", 8 ) == 0 ) { // We will replace registration for ooostub, too bRet = true; } + else + { + OutputDebugStringFormat( " Checking OpenWithList of [%s].\n", lpSubKey ); + HKEY hSubKey; + lResult = RegOpenKeyExA( hKey, "OpenWithList", 0, KEY_ENUMERATE_SUB_KEYS, &hSubKey ); + if ( ERROR_SUCCESS == lResult ) + { + DWORD nIndex = 0; + while ( ERROR_SUCCESS == lResult ) + { + nSize = sizeof( szBuffer ); + lResult = RegEnumKeyExA( hSubKey, nIndex++, szBuffer, &nSize, NULL, NULL, NULL, NULL ); + if ( ERROR_SUCCESS == lResult ) + { + OutputDebugStringFormat( " Found value [%s] in OpenWithList of [%s].\n", szBuffer, lpSubKey ); + if ( strncmp( szBuffer, "WordPad.exe", 11 ) == 0 ) + { // We will replace registration for word pad + bRet = true; + } + else if ( nSize > 0 ) + bRet = false; + } + } + } + else + { + OutputDebugStringFormat( " No OpenWithList found!\n" ); + } + } } else // no default value found -> return TRUE to register for that key bRet = true; diff --git a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx new file mode 100644 index 000000000..68d7cef52 --- /dev/null +++ b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx @@ -0,0 +1,180 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * 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 + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#define _WIN32_WINDOWS 0x0410 +#ifdef _MSC_VER +#pragma warning(push, 1) /* disable warnings within system headers */ +#endif +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <msiquery.h> +#ifdef _MSC_VER +#pragma warning(pop) +#endif + +#include <malloc.h> + +#ifdef UNICODE +#define _UNICODE +#define _tstring wstring +#else +#define _tstring string +#endif +#include <tchar.h> +#include <string> + +using namespace std; + +namespace +{ + std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty ) + { + std::_tstring result; + TCHAR szDummy[1] = TEXT(""); + DWORD nChars = 0; + + if ( MsiGetProperty( handle, sProperty.c_str(), szDummy, &nChars ) == ERROR_MORE_DATA ) + { + DWORD nBytes = ++nChars * sizeof(TCHAR); + LPTSTR buffer = reinterpret_cast<LPTSTR>(_alloca(nBytes)); + ZeroMemory( buffer, nBytes ); + MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars); + result = buffer; + } + + return result; + } +} // namespace + +extern "C" UINT __stdcall CompleteInstallPath( MSIHANDLE handle ) +{ + // This CustomAction is necessary for updates from OOo 3.0, OOo 3.1 and OOo 3.2 to versions + // OOo 3.3 or later. This is caused by a change of INSTALLLOCATION, that starting with OOo 3.3 + // contains the name of the product again (instead of only "c:\program files"). Unfortunately + // this causes in an update installation, that INSTALLLOCATION is set to "c:\program files", + // so that in an OOo 3.3 or later, the directory "program" or "share" are directly created + // below "c:\program files". + + TCHAR szValue[8192]; + DWORD nValueSize = sizeof(szValue); + HKEY hKey; + std::_tstring sInstDir; + std::_tstring mystr; + + // Reading property OFFICEDIRHOSTNAME_, that contains the part of the path behind + // the program files folder. + + std::_tstring sInstallLocation = GetMsiProperty( handle, TEXT("INSTALLLOCATION") ); + std::_tstring sOfficeDirHostname = GetMsiProperty( handle, TEXT("OFFICEDIRHOSTNAME_") ); + + // If sInstallLocation ends with (contains) the string sOfficeDirHostname, + // INSTALLLOCATION is good and nothing has to be done here. + + bool pathCompletionRequired = true; + + if ( _tcsstr( sInstallLocation.c_str(), sOfficeDirHostname.c_str() ) ) + { + pathCompletionRequired = false; // nothing to do + // mystr = "Nothing to do, officedir is included into installlocation"; + // MessageBox( NULL, mystr.c_str(), "It is part of installlocation", MB_OK ); + } + + // If the path INSTALLLOCATION does not end with this string, INSTALLLOCATION is maybe + // transfered from an OOo 3.0, OOo 3.1 and OOo 3.2 and need to be changed therefore. + + if ( pathCompletionRequired ) + { + std::_tstring sManufacturer = GetMsiProperty( handle, TEXT("Manufacturer") ); + std::_tstring sDefinedName = GetMsiProperty( handle, TEXT("DEFINEDPRODUCT") ); + std::_tstring sUpgradeCode = GetMsiProperty( handle, TEXT("UpgradeCode") ); + + // sUpdateVersion can be "3.0", "3.1" or "3.2" + + std::_tstring sProductKey30 = "Software\\" + sManufacturer + "\\" + sDefinedName + + "\\" + "3.0" + "\\" + sUpgradeCode; + + std::_tstring sProductKey31 = "Software\\" + sManufacturer + "\\" + sDefinedName + + "\\" + "3.1" + "\\" + sUpgradeCode; + + std::_tstring sProductKey32 = "Software\\" + sManufacturer + "\\" + sDefinedName + + "\\" + "3.2" + "\\" + sUpgradeCode; + + // mystr = "ProductKey: " + sProductKey; + // MessageBox( NULL, mystr.c_str(), "ProductKey", MB_OK ); + + // mystr = "Checking registry"; + // MessageBox( NULL, mystr.c_str(), "registry search", MB_OK ); + + bool oldVersionExists = false; + + if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER, sProductKey30.c_str(), &hKey ) ) + { + oldVersionExists = true; + RegCloseKey( hKey ); + } + else if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER, sProductKey31.c_str(), &hKey ) ) + { + oldVersionExists = true; + RegCloseKey( hKey ); + } + else if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER, sProductKey32.c_str(), &hKey ) ) + { + oldVersionExists = true; + RegCloseKey( hKey ); + } + else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE, sProductKey30.c_str(), &hKey ) ) + { + oldVersionExists = true; + RegCloseKey( hKey ); + } + else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE, sProductKey31.c_str(), &hKey ) ) + { + oldVersionExists = true; + RegCloseKey( hKey ); + } + else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE, sProductKey32.c_str(), &hKey ) ) + { + oldVersionExists = true; + RegCloseKey( hKey ); + } + + if ( oldVersionExists ) + { + // Adding the new path content sOfficeDirHostname + sInstallLocation = sInstallLocation + sOfficeDirHostname; + // Setting the new property value + MsiSetProperty(handle, TEXT("INSTALLLOCATION"), sInstallLocation.c_str()); + // mystr = "Setting path to: " + sInstallLocation; + // MessageBox( NULL, mystr.c_str(), "sInstallLocation", MB_OK ); + } + } + + // mystr = "Ending with INSTALLLOCATION: " + sInstallLocation; + // MessageBox( NULL, mystr.c_str(), "END", MB_OK ); + + return ERROR_SUCCESS; +} diff --git a/setup_native/source/win32/customactions/shellextensions/exports.dxp b/setup_native/source/win32/customactions/shellextensions/exports.dxp index 0e53492e4..5826d3392 100644 --- a/setup_native/source/win32/customactions/shellextensions/exports.dxp +++ b/setup_native/source/win32/customactions/shellextensions/exports.dxp @@ -5,7 +5,10 @@ DeinstallStartmenuFolderIcon SetProductInstallMode RebuildShellIconCache ExecutePostUninstallScript +CompleteInstallPath MigrateInstallPath +RegisterExtensions +RemoveExtensions CheckInstallDirectory SetAdminInstallProperty CreateLayerLinks diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk index 9eef136a8..23fe24bb6 100644 --- a/setup_native/source/win32/customactions/shellextensions/makefile.mk +++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk @@ -58,10 +58,12 @@ SLOFILES = \ $(SLO)$/iconcache.obj \ $(SLO)$/postuninstall.obj \ $(SLO)$/migrateinstallpath.obj \ + $(SLO)$/completeinstallpath.obj \ $(SLO)$/checkdirectory.obj \ $(SLO)$/setadmininstall.obj \ $(SLO)$/layerlinks.obj \ $(SLO)$/dotnetcheck.obj \ + $(SLO)$/registerextensions.obj \ $(SLO)$/copyeditiondata.obj \ $(SLO)$/vistaspecial.obj \ $(SLO)$/checkrunningoffice.obj \ diff --git a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx index 83946e794..c1aadd409 100644 --- a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx +++ b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx @@ -319,202 +319,56 @@ extern "C" UINT __stdcall RegisterExtensions(MSIHANDLE handle) { std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") ); std::_tstring sUnoPkgFile = sInstDir + TEXT("program\\unopkg.exe"); - std::_tstring sShareInstallDir = sInstDir + TEXT("share\\extension\\install\\"); - std::_tstring sPattern = sShareInstallDir + TEXT("*.oxt"); std::_tstring mystr; WIN32_FIND_DATA aFindFileData; mystr = "unopkg file: " + sUnoPkgFile; - // MessageBox(NULL, mystr.c_str(), "Command", MB_OK); - - mystr = "oxt file directory: " + sShareInstallDir; - // MessageBox(NULL, mystr.c_str(), "Command", MB_OK); + //MessageBox(NULL, mystr.c_str(), "Command", MB_OK); // Find unopkg.exe - HANDLE hFindUnopkg = FindFirstFile( sUnoPkgFile.c_str(), &aFindFileData ); if ( hFindUnopkg != INVALID_HANDLE_VALUE ) { // unopkg.exe exists in program directory - // Finding all oxt files in sShareInstallDir - - HANDLE hFindOxt = FindFirstFile( sPattern.c_str(), &aFindFileData ); - - if ( hFindOxt != INVALID_HANDLE_VALUE ) - { - bool fNextFile = false; + const std::_tstring sTempFolder(createTempFolder()); + std::_tstring sCommandPart1 = sUnoPkgFile + " sync"; + std::_tstring sCommand = sCommandPart1 + + TEXT(" -env:BUNDLED_EXTENSIONS_USER=$BRAND_BASE_DIR/share/prereg/bundled") + + TEXT(" -env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml") + + TEXT(" -env:UserInstallation=") + sTempFolder; + mystr = "Command: " + sCommand; + //MessageBox(NULL, mystr.c_str(), "Command", MB_OK); + + DWORD exitCode = 0; + bool fSuccess = ExecuteCommand( sCommand.c_str(), & exitCode); - do - { - const std::_tstring sTempFolder(createTempFolder()); - std::_tstring sOxtFile = sShareInstallDir + aFindFileData.cFileName; - std::_tstring sCommandPart1 = sUnoPkgFile + " add --shared --suppress-license --bundled " + "\"" + sOxtFile + "\""; - std::_tstring sCommand = sCommandPart1 - + TEXT(" -env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml") - + TEXT(" -env:UserInstallation=") + sTempFolder; - mystr = "Command: " + sCommand; - // MessageBox(NULL, mystr.c_str(), "Command", MB_OK); - - DWORD exitCode = 0; - bool fSuccess = ExecuteCommand( sCommand.c_str(), & exitCode); - // unopkg in OOo 2.2.1 and early had a bug that it failed when receiving - // a bootstrap parameter (-env:...) then it exited with a value != 0. - if (fSuccess && exitCode != 0) - { - std::_tstring sCommand = sCommandPart1; - mystr = "Command: " + sCommand; - // MessageBox(NULL, mystr.c_str(), "Command", MB_OK); - fSuccess = ExecuteCommand( sCommand.c_str(), & exitCode); - } - deleteTempFolder(sTempFolder); - - // if ( fSuccess ) - // { - // mystr = "Executed successfully!"; - // MessageBox(NULL, mystr.c_str(), "Command", MB_OK); - // } - // else - // { - // mystr = "An error occured during execution!"; - // MessageBox(NULL, mystr.c_str(), "Command", MB_OK); - // } - - fNextFile = FindNextFile( hFindOxt, &aFindFileData ); - - } while ( fNextFile ); - - FindClose( hFindOxt ); - } + deleteTempFolder(sTempFolder); + +// if ( fSuccess ) +// { +// mystr = "Executed successfully!"; +// MessageBox(NULL, mystr.c_str(), "Command", MB_OK); +// } +// else +// { +// mystr = "An error occured during execution!"; +// MessageBox(NULL, mystr.c_str(), "Command", MB_OK); +// } + + FindClose( hFindUnopkg ); } - // else - // { - // mystr = "Error: Did not find " + sUnoPkgFile; - // MessageBox(NULL, mystr.c_str(), "Command", MB_OK); - // } +// else +// { +// mystr = "Error: Did not find " + sUnoPkgFile; +// MessageBox(NULL, mystr.c_str(), "Command", MB_OK); +// } return ERROR_SUCCESS; } -extern "C" UINT __stdcall DeregisterExtensions(MSIHANDLE handle) -{ - std::_tstring mystr; - - // Finding the product with the help of the propery FINDPRODUCT, - // that contains a Windows Registry key, that points to the install location. - - TCHAR szValue[8192]; - DWORD nValueSize = sizeof(szValue); - HKEY hKey; - std::_tstring sInstDir; - - std::_tstring sProductKey = GetMsiProperty( handle, TEXT("FINDPRODUCT") ); - // MessageBox( NULL, sProductKey.c_str(), "Titel", MB_OK ); - - if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER, sProductKey.c_str(), &hKey ) ) - { - if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) ) - { - sInstDir = szValue; - } - RegCloseKey( hKey ); - } - else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE, sProductKey.c_str(), &hKey ) ) - { - if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) ) - { - sInstDir = szValue; - } - RegCloseKey( hKey ); - } - else - { - return ERROR_SUCCESS; - } - - // MessageBox( NULL, sInstDir.c_str(), "install location", MB_OK ); - - // Searching for the unopkg.exe - - std::_tstring sUnoPkgFile = sInstDir + TEXT("program\\unopkg.exe"); - std::_tstring sShareInstallDir = sInstDir + TEXT("share\\extension\\install\\"); - std::_tstring sPattern = sShareInstallDir + TEXT("*.oxt"); - - WIN32_FIND_DATA aFindFileData; - - // Find unopkg.exe - - HANDLE hFindUnopkg = FindFirstFile( sUnoPkgFile.c_str(), &aFindFileData ); - - if ( hFindUnopkg != INVALID_HANDLE_VALUE ) - { - // unopkg.exe exists in program directory - - // Finding all oxt files in sShareInstallDir - - HANDLE hFindOxt = FindFirstFile( sPattern.c_str(), &aFindFileData ); - - if ( hFindOxt != INVALID_HANDLE_VALUE ) - { - bool fNextFile = false; - - do - { - const std::_tstring sTempFolder(createTempFolder()); - // When removing extensions, only the oxt file name is required, without path - // Therefore no quoting is required - // std::_tstring sOxtFile = sShareInstallDir + aFindFileData.cFileName; - std::_tstring sOxtFile = aFindFileData.cFileName; - std::_tstring sCommandPart1 = sUnoPkgFile + " remove --shared --bundled " + "\"" - + sOxtFile + "\""; - std::_tstring sCommand = sCommandPart1 - + TEXT(" -env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml") - + TEXT(" -env:UserInstallation=") + sTempFolder; - - mystr = "Command: " + sCommand; - //MessageBox(NULL, mystr.c_str(), "Command", MB_OK); - DWORD exitCode = 0; - bool fSuccess = ExecuteCommand( sCommand.c_str(), & exitCode); - // unopkg in OOo 2.2.1 and early had a bug that it failed when receiving - // a bootstrap parameter (-env:...) then it exited with a value != 0. - if (fSuccess && exitCode != 0) - { - std::_tstring sCommand = sCommandPart1; - mystr = "Command: " + sCommand; - //MessageBox(NULL, mystr.c_str(), "Command", MB_OK); - fSuccess = ExecuteCommand( sCommand.c_str(), & exitCode); - } - - deleteTempFolder(sTempFolder); - - if ( fSuccess ) - { - mystr = "Executed successfully!"; - // MessageBox(NULL, mystr.c_str(), "Command", MB_OK); - } - else - { - mystr = "An error occured during execution!"; - // MessageBox(NULL, mystr.c_str(), "Command", MB_OK); - } - - fNextFile = FindNextFile( hFindOxt, &aFindFileData ); - - } while ( fNextFile ); - - FindClose( hFindOxt ); - } - } - // else - // { - // mystr = "Not found: " + sUnoPkgFile; - // MessageBox(NULL, mystr.c_str(), "Command", MB_OK); - // } - - return ERROR_SUCCESS; -} extern "C" UINT __stdcall RemoveExtensions(MSIHANDLE handle) { @@ -529,7 +383,7 @@ extern "C" UINT __stdcall RemoveExtensions(MSIHANDLE handle) std::_tstring sInstDir; std::_tstring sProductKey = GetMsiProperty( handle, TEXT("FINDPRODUCT") ); - // MessageBox( NULL, sProductKey.c_str(), "Titel", MB_OK ); + //MessageBox( NULL, sProductKey.c_str(), "Titel", MB_OK ); if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER, sProductKey.c_str(), &hKey ) ) { @@ -552,22 +406,22 @@ extern "C" UINT __stdcall RemoveExtensions(MSIHANDLE handle) return ERROR_SUCCESS; } - // Removing complete directory "share\uno_packages\cache" + // Removing complete directory "Basis\presets\bundled" - std::_tstring sCacheDir = sInstDir + TEXT("share\\uno_packages\\cache"); + std::_tstring sCacheDir = sInstDir + TEXT("share\\prereg\\bundled"); bool fSuccess = RemoveCompleteDirectory( sCacheDir ); - if ( fSuccess ) - { - mystr = "Executed successfully!"; - // MessageBox(NULL, mystr.c_str(), "Main methode", MB_OK); - } - else - { - mystr = "An error occured during execution!"; - // MessageBox(NULL, mystr.c_str(), "Main methode", MB_OK); - } +// if ( fSuccess ) +// { +// mystr = "Executed successfully!"; +// MessageBox(NULL, mystr.c_str(), "Main methode", MB_OK); +// } +// else +// { +// mystr = "An error occured during execution!"; +// MessageBox(NULL, mystr.c_str(), "Main methode", MB_OK); +// } return ERROR_SUCCESS; } diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java index 9df6bbef9..e4452bb60 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java @@ -26,6 +26,7 @@ ************************************************************************/ package com.sun.star.wizards.agenda; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.awt.FontDescriptor; import com.sun.star.awt.XButton; import com.sun.star.awt.XCheckBox; @@ -381,4 +382,4 @@ public abstract class AgendaWizardDialog extends WizardDialog implements Agenda } -}
\ No newline at end of file +} diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java index 109818f88..6e06327ef 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java @@ -26,6 +26,8 @@ ************************************************************************/ package com.sun.star.wizards.agenda; +import com.sun.star.wizards.common.HelpIds; + public interface AgendaWizardDialogConst { /** @@ -58,37 +60,37 @@ public interface AgendaWizardDialogConst { * "HID:(hid+5)" - the cancel button */ - final String LISTPAGEDESIGN_HID = "HID:" + (HID + 6); - final String CHKMINUTES_HID = "HID:" + (HID + 7); - final String TXTTIME_HID = "HID:" + (HID + 8); - final String TXTDATE_HID = "HID:" + (HID + 9); - final String TXTTITLE_HID = "HID:" + (HID + 10); - final String CBLOCATION_HID = "HID:" + (HID + 11); + final String LISTPAGEDESIGN_HID = HelpIds.getHelpIdString((HID + 6)); + final String CHKMINUTES_HID = HelpIds.getHelpIdString((HID + 7)); + final String TXTTIME_HID = HelpIds.getHelpIdString((HID + 8)); + final String TXTDATE_HID = HelpIds.getHelpIdString((HID + 9)); + final String TXTTITLE_HID = HelpIds.getHelpIdString((HID + 10)); + final String CBLOCATION_HID = HelpIds.getHelpIdString((HID + 11)); - final String CHKMEETINGTITLE_HID = "HID:" + (HID + 12); - final String CHKREAD_HID = "HID:" + (HID + 13); - final String CHKBRING_HID = "HID:" + (HID + 14); - final String CHKNOTES_HID = "HID:" + (HID + 15); + final String CHKMEETINGTITLE_HID = HelpIds.getHelpIdString((HID + 12)); + final String CHKREAD_HID = HelpIds.getHelpIdString((HID + 13)); + final String CHKBRING_HID = HelpIds.getHelpIdString((HID + 14)); + final String CHKNOTES_HID = HelpIds.getHelpIdString((HID + 15)); - final String CHKCONVENEDBY_HID = "HID:" + (HID + 16); - final String CHKPRESIDING_HID = "HID:" + (HID + 17); - final String CHKNOTETAKER_HID = "HID:" + (HID + 18); - final String CHKTIMEKEEPER_HID = "HID:" + (HID + 19); - final String CHKATTENDEES_HID = "HID:" + (HID + 20); - final String CHKOBSERVERS_HID = "HID:" + (HID + 21); - final String CHKRESOURCEPERSONS_HID = "HID:" + (HID + 22); + final String CHKCONVENEDBY_HID = HelpIds.getHelpIdString((HID + 16)); + final String CHKPRESIDING_HID = HelpIds.getHelpIdString((HID + 17)); + final String CHKNOTETAKER_HID = HelpIds.getHelpIdString((HID + 18)); + final String CHKTIMEKEEPER_HID = HelpIds.getHelpIdString((HID + 19)); + final String CHKATTENDEES_HID = HelpIds.getHelpIdString((HID + 20)); + final String CHKOBSERVERS_HID = HelpIds.getHelpIdString((HID + 21)); + final String CHKRESOURCEPERSONS_HID = HelpIds.getHelpIdString((HID + 22)); - final String TXTTEMPLATENAME_HID = "HID:" + (HID + 23); - final String TXTTEMPLATEPATH_HID = "HID:" + (HID + 24); - final String BTNTEMPLATEPATH_HID = "HID:" + (HID + 25); + final String TXTTEMPLATENAME_HID = HelpIds.getHelpIdString((HID + 23)); + final String TXTTEMPLATEPATH_HID = HelpIds.getHelpIdString((HID + 24)); + final String BTNTEMPLATEPATH_HID = HelpIds.getHelpIdString((HID + 25)); - final String OPTCREATEAGENDA_HID = "HID:" + (HID + 26); - final String OPTMAKECHANGES_HID = "HID:" + (HID + 27); + final String OPTCREATEAGENDA_HID = HelpIds.getHelpIdString((HID + 26)); + final String OPTMAKECHANGES_HID = HelpIds.getHelpIdString((HID + 27)); - final String BTNINSERT_HID = "HID:" + (HID + 28); - final String BTNREMOVE_HID = "HID:" + (HID + 29); - final String BTNUP_HID = "HID:" + (HID + 30); - final String BTNDOWN_HID = "HID:" + (HID + 31); + final String BTNINSERT_HID = HelpIds.getHelpIdString((HID + 28)); + final String BTNREMOVE_HID = HelpIds.getHelpIdString((HID + 29)); + final String BTNUP_HID = HelpIds.getHelpIdString((HID + 30)); + final String BTNDOWN_HID = HelpIds.getHelpIdString((HID + 31)); final int LAST_HID = HID + 32; @@ -104,4 +106,4 @@ public interface AgendaWizardDialogConst { } -
\ No newline at end of file + diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java index a2969df13..963b3002a 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java @@ -40,7 +40,6 @@ import com.sun.star.lang.EventObject; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.task.XInteractionHandler; import com.sun.star.text.XTextDocument; -//import com.sun.star.uno.Exception; import com.sun.star.uno.UnoRuntime; import com.sun.star.util.CloseVetoException; import com.sun.star.util.XCloseable; @@ -50,6 +49,7 @@ import com.sun.star.wizards.common.FileAccess; import com.sun.star.wizards.common.Helper; import com.sun.star.wizards.common.NoValidPathException; import com.sun.star.wizards.common.SystemDialog; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.document.OfficeDocument; import com.sun.star.wizards.text.ViewHandler; import com.sun.star.wizards.ui.PathSelection; @@ -202,7 +202,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog public void insertPathSelectionControl() { myPathSelection = new PathSelection(xMSF, this, PathSelection.TransferMode.SAVE, PathSelection.DialogTypes.FILE); - myPathSelection.insert(6, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, "HID:" + ( HID + 24 ), "HID:" + ( HID + 25 )); + myPathSelection.insert(6, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, HelpIds.getHelpIdString( HID + 24 ), HelpIds.getHelpIdString( HID + 25 )); myPathSelection.sDefaultDirectory = sUserTemplatePath; myPathSelection.sDefaultName = "myAgendaTemplate.ott"; myPathSelection.sDefaultFilter = "writer8_template"; @@ -594,4 +594,4 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog } -
\ No newline at end of file + diff --git a/wizards/com/sun/star/wizards/agenda/CallWizard.java b/wizards/com/sun/star/wizards/agenda/CallWizard.java index de5a16106..bcaf82726 100644 --- a/wizards/com/sun/star/wizards/agenda/CallWizard.java +++ b/wizards/com/sun/star/wizards/agenda/CallWizard.java @@ -40,8 +40,7 @@ import com.sun.star.uno.Type; /** * This class capsulates the class, that implements the minimal component, a factory for - * creating the service (<CODE>__getServiceFactory</CODE>) and a method, that writes the - * information into the given registry key (<CODE>__writeRegistryServiceInfo</CODE>). + * creating the service (<CODE>__getServiceFactory</CODE>). * * @author $author$ * @version $Revision: 1.5.52.1 $ @@ -74,21 +73,6 @@ public class CallWizard { } /** - * Writes the service information into the given registry key. This method is called - * by the <code>JavaLoader</code>. - * - * @param xregistrykey Makes structural information (except regarding tree - * structures) of a single registry key accessible. - * - * @return returns true if the operation succeeded - * - * @see com.sun.star.comp.loader.JavaLoader# - */ - public static boolean __writeRegistryServiceInfo(XRegistryKey xregistrykey) { - return FactoryHelper.writeRegistryServiceInfo(WizardImplementation.class.getName(), WizardImplementation.__serviceName, xregistrykey); - } - - /** * This class implements the component. At least the interfaces XServiceInfo, * XTypeProvider, and XInitialization should be provided by the service. */ diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.java b/wizards/com/sun/star/wizards/agenda/TopicsControl.java index db39ea99d..08f03ca6a 100644 --- a/wizards/com/sun/star/wizards/agenda/TopicsControl.java +++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.java @@ -27,6 +27,7 @@ package com.sun.star.wizards.agenda; import java.util.List; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.awt.FocusEvent; import com.sun.star.awt.Key; @@ -1178,21 +1179,21 @@ public class TopicsControl extends ControlScroller implements XFocusListener TEXT_PROPS, new Object[] { - I_12, "HID:" + (curHelpIndex + i * 3 + 1), new Integer(x + 15), y_, IStep, new Short((short) (tabindex + 1)), new Integer(84) + I_12, HelpIds.getHelpIdString(curHelpIndex + i * 3 + 1), new Integer(x + 15), y_, IStep, new Short((short) (tabindex + 1)), new Integer(84) }); combobox = dialog.insertTextField(RESP + i, "responsibleTextChanged", this, TEXT_PROPS, new Object[] { - I_12, "HID:" + (curHelpIndex + i * 3 + 2), new Integer(x + 103), y_, IStep, new Short((short) (tabindex + 2)), new Integer(68) + I_12, HelpIds.getHelpIdString(curHelpIndex + i * 3 + 2), new Integer(x + 103), y_, IStep, new Short((short) (tabindex + 2)), new Integer(68) }); timebox = dialog.insertTextField(TIME + i, "timeTextChanged", this, TEXT_PROPS, new Object[] { - I_12, "HID:" + (curHelpIndex + i * 3 + 3), new Integer(x + 175), y_, IStep, new Short((short) (tabindex + 3)), new Integer(20) + I_12, HelpIds.getHelpIdString(curHelpIndex + i * 3 + 3), new Integer(x + 175), y_, IStep, new Short((short) (tabindex + 3)), new Integer(20) }); setEnabled(false); diff --git a/wizards/com/sun/star/wizards/agenda/agenda.component b/wizards/com/sun/star/wizards/agenda/agenda.component new file mode 100644 index 000000000..e35087d94 --- /dev/null +++ b/wizards/com/sun/star/wizards/agenda/agenda.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Java2" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation + name="com.sun.star.wizards.agenda.CallWizard$WizardImplementation"> + <service name="com.sun.star.wizards.agenda.CallWizard"/> + </implementation> +</component> diff --git a/wizards/com/sun/star/wizards/agenda/makefile.mk b/wizards/com/sun/star/wizards/agenda/makefile.mk index 314dcf3b7..1f07e9adf 100644 --- a/wizards/com/sun/star/wizards/agenda/makefile.mk +++ b/wizards/com/sun/star/wizards/agenda/makefile.mk @@ -69,3 +69,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/agenda.component + +$(MISC)/agenda.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + agenda.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt agenda.component diff --git a/wizards/com/sun/star/wizards/common/HelpIds.java b/wizards/com/sun/star/wizards/common/HelpIds.java new file mode 100644 index 000000000..05c80fcad --- /dev/null +++ b/wizards/com/sun/star/wizards/common/HelpIds.java @@ -0,0 +1,1047 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * 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 + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package com.sun.star.wizards.common; + +public class HelpIds +{ + private static String array1[] = new String[] + { + "HID:WIZARDS_HID0_WEBWIZARD", // HID:34200 + "HID:WIZARDS_HID0_HELP", // HID:34201 + "HID:WIZARDS_HID0_NEXT", // HID:34202 + "HID:WIZARDS_HID0_PREV", // HID:34203 + "HID:WIZARDS_HID0_CREATE", // HID:34204 + "HID:WIZARDS_HID0_CANCEL", // HID:34205 + "HID:WIZARDS_HID0_STATUS_DIALOG", // HID:34206 + "HID:WIZARDS_HID1_LST_SESSIONS", // HID:34207 + "", + "HID:WIZARDS_HID1_BTN_DEL_SES", // HID:34209 + "HID:WIZARDS_HID2_LST_DOCS", // HID:34210 + "HID:WIZARDS_HID2_BTN_ADD_DOC", // HID:34211 + "HID:WIZARDS_HID2_BTN_REM_DOC", // HID:34212 + "HID:WIZARDS_HID2_BTN_DOC_UP", // HID:34213 + "HID:WIZARDS_HID2_BTN_DOC_DOWN", // HID:34214 + "HID:WIZARDS_HID2_TXT_DOC_TITLE", // HID:34215 + "HID:WIZARDS_HID2_TXT_DOC_DESC", // HID:34216 + "HID:WIZARDS_HID2_TXT_DOC_AUTHOR", // HID:34217 + "HID:WIZARDS_HID2_LST_DOC_EXPORT", // HID:34218 + "HID:WIZARDS_HID2_STATUS_ADD_DOCS", // HID:34219 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG1", // HID:34220 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG2", // HID:34221 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG3", // HID:34222 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG4", // HID:34223 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG5", // HID:34224 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG6", // HID:34225 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG7", // HID:34226 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG8", // HID:34227 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG9", // HID:34228 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG10", // HID:34229 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG11", // HID:34230 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG12", // HID:34231 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG13", // HID:34232 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG14", // HID:34233 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG15", // HID:34234 + "HID:WIZARDS_HID4_CHK_DISPLAY_FILENAME", // HID:34235 + "HID:WIZARDS_HID4_CHK_DISPLAY_DESCRIPTION", // HID:34236 + "HID:WIZARDS_HID4_CHK_DISPLAY_AUTHOR", // HID:34237 + "HID:WIZARDS_HID4_CHK_DISPLAY_CR_DATE", // HID:34238 + "HID:WIZARDS_HID4_CHK_DISPLAY_UP_DATE", // HID:34239 + "HID:WIZARDS_HID4_CHK_DISPLAY_FORMAT", // HID:34240 + "HID:WIZARDS_HID4_CHK_DISPLAY_F_ICON", // HID:34241 + "HID:WIZARDS_HID4_CHK_DISPLAY_PAGES", // HID:34242 + "HID:WIZARDS_HID4_CHK_DISPLAY_SIZE", // HID:34243 + "HID:WIZARDS_HID4_GRP_OPTIMAIZE_640", // HID:34244 + "HID:WIZARDS_HID4_GRP_OPTIMAIZE_800", // HID:34245 + "HID:WIZARDS_HID4_GRP_OPTIMAIZE_1024", // HID:34246 + "HID:WIZARDS_HID5_LST_STYLES", // HID:34247 + "HID:WIZARDS_HID5_BTN_BACKGND", // HID:34248 + "HID:WIZARDS_HID5_BTN_ICONS", // HID:34249 + "HID:WIZARDS_HID6_TXT_SITE_TITLE", // HID:34250 + "", + "", + "HID:WIZARDS_HID6_TXT_SITE_DESC", // HID:34253 + "", + "HID:WIZARDS_HID6_DATE_SITE_CREATED", // HID:34255 + "HID:WIZARDS_HID6_DATE_SITE_UPDATED", // HID:34256 + "", + "HID:WIZARDS_HID6_TXT_SITE_EMAIL", // HID:34258 + "HID:WIZARDS_HID6_TXT_SITE_COPYRIGHT", // HID:34259 + "HID:WIZARDS_HID7_BTN_PREVIEW", // HID:34260 + "HID:WIZARDS_HID7_CHK_PUBLISH_LOCAL", // HID:34261 + "HID:WIZARDS_HID7_TXT_LOCAL", // HID:34262 + "HID:WIZARDS_HID7_BTN_LOCAL", // HID:34263 + "HID:WIZARDS_HID7_CHK_PUBLISH_ZIP", // HID:34264 + "HID:WIZARDS_HID7_TXT_ZIP", // HID:34265 + "HID:WIZARDS_HID7_BTN_ZIP", // HID:34266 + "HID:WIZARDS_HID7_CHK_PUBLISH_FTP", // HID:34267 + "HID:WIZARDS_HID7_TXT_FTP", // HID:34268 + "HID:WIZARDS_HID7_BTN_FTP", // HID:34269 + "HID:WIZARDS_HID7_CHK_SAVE", // HID:34270 + "HID:WIZARDS_HID7_TXT_SAVE", // HID:34271 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_BG", // HID:34290 + "HID:WIZARDS_HID_BG_BTN_OTHER", // HID:34291 + "HID:WIZARDS_HID_BG_BTN_NONE", // HID:34292 + "HID:WIZARDS_HID_BG_BTN_OK", // HID:34293 + "HID:WIZARDS_HID_BG_BTN_CANCEL", // HID:34294 + "HID:WIZARDS_HID_BG_BTN_BACK", // HID:34295 + "HID:WIZARDS_HID_BG_BTN_FW", // HID:34296 + "HID:WIZARDS_HID_BG_BTN_IMG1", // HID:34297 + "HID:WIZARDS_HID_BG_BTN_IMG2", // HID:34298 + "HID:WIZARDS_HID_BG_BTN_IMG3", // HID:34299 + "HID:WIZARDS_HID_BG_BTN_IMG4", // HID:34300 + "HID:WIZARDS_HID_BG_BTN_IMG5", // HID:34301 + "HID:WIZARDS_HID_BG_BTN_IMG6", // HID:34302 + "HID:WIZARDS_HID_BG_BTN_IMG7", // HID:34303 + "HID:WIZARDS_HID_BG_BTN_IMG8", // HID:34304 + "HID:WIZARDS_HID_BG_BTN_IMG9", // HID:34305 + "HID:WIZARDS_HID_BG_BTN_IMG10", // HID:34306 + "HID:WIZARDS_HID_BG_BTN_IMG11", // HID:34307 + "HID:WIZARDS_HID_BG_BTN_IMG12", // HID:34308 + "HID:WIZARDS_HID_BG_BTN_IMG13", // HID:34309 + "HID:WIZARDS_HID_BG_BTN_IMG14", // HID:34300 + "HID:WIZARDS_HID_BG_BTN_IMG15", // HID:34311 + "HID:WIZARDS_HID_BG_BTN_IMG16", // HID:34312 + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGREPORT_DIALOG", // HID:34320 + "", + "HID:WIZARDS_HID_DLGREPORT_0_CMDPREV", // HID:34322 + "HID:WIZARDS_HID_DLGREPORT_0_CMDNEXT", // HID:34323 + "HID:WIZARDS_HID_DLGREPORT_0_CMDFINISH", // HID:34324 + "HID:WIZARDS_HID_DLGREPORT_0_CMDCANCEL", // HID:34325 + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGREPORT_1_LBTABLES", // HID:34330 + "HID:WIZARDS_HID_DLGREPORT_1_FIELDSAVAILABLE", // HID:34331 + "HID:WIZARDS_HID_DLGREPORT_1_CMDMOVESELECTED", // HID:34332 + "HID:WIZARDS_HID_DLGREPORT_1_CMDMOVEALL", // HID:34333 + "HID:WIZARDS_HID_DLGREPORT_1_CMDREMOVESELECTED", // HID:34334 + "HID:WIZARDS_HID_DLGREPORT_1_CMDREMOVEALL", // HID:34335 + "HID:WIZARDS_HID_DLGREPORT_1_FIELDSSELECTED", // HID:34336 + "HID:WIZARDS_HID_DLGREPORT_1_CMDMOVEUP", // HID:34337 + "HID:WIZARDS_HID_DLGREPORT_1_CMDMOVEDOWN", // HID:34338 + "", + "HID:WIZARDS_HID_DLGREPORT_2_GROUPING", // HID:34340 + "HID:WIZARDS_HID_DLGREPORT_2_CMDGROUP", // HID:34341 + "HID:WIZARDS_HID_DLGREPORT_2_CMDUNGROUP", // HID:34342 + "HID:WIZARDS_HID_DLGREPORT_2_PREGROUPINGDEST", // HID:34343 + "HID:WIZARDS_HID_DLGREPORT_2_CMDMOVEUPGROUP", // HID:34344 + "HID:WIZARDS_HID_DLGREPORT_2_CMDMOVEDOWNGROUP", // HID:34345 + "HID:WIZARDS_HID_DLGREPORT_3_SORT1", // HID:34346 + "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND1", // HID:34347 + "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND1", // HID:34348 + "HID:WIZARDS_HID_DLGREPORT_3_SORT2", // HID:34349 + "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND2", // HID:34350 + "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND2", // HID:34351 + "HID:WIZARDS_HID_DLGREPORT_3_SORT3", // HID:34352 + "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND3", // HID:34353 + "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND3", // HID:34354 + "HID:WIZARDS_HID_DLGREPORT_3_SORT4", // HID:34355 + "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND4", // HID:34356 + "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND4", // HID:34357 + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGREPORT_4_TITLE", // HID:34362 + "HID:WIZARDS_HID_DLGREPORT_4_DATALAYOUT", // HID:34363 + "HID:WIZARDS_HID_DLGREPORT_4_PAGELAYOUT", // HID:34364 + "HID:WIZARDS_HID_DLGREPORT_4_LANDSCAPE", // HID:34365 + "HID:WIZARDS_HID_DLGREPORT_4_PORTRAIT", // HID:34366 + "", + "", + "", + "HID:WIZARDS_HID_DLGREPORT_5_OPTDYNTEMPLATE", // HID:34370 + "HID:WIZARDS_HID_DLGREPORT_5_OPTSTATDOCUMENT", // HID:34371 + "HID:WIZARDS_HID_DLGREPORT_5_TXTTEMPLATEPATH", // HID:34372 + "HID:WIZARDS_HID_DLGREPORT_5_CMDTEMPLATEPATH", // HID:34373 + "HID:WIZARDS_HID_DLGREPORT_5_OPTEDITTEMPLATE", // HID:34374 + "HID:WIZARDS_HID_DLGREPORT_5_OPTUSETEMPLATE", // HID:34375 + "HID:WIZARDS_HID_DLGREPORT_5_TXTDOCUMENTPATH", // HID:34376 + "HID:WIZARDS_HID_DLGREPORT_5_CMDDOCUMENTPATH", // HID:34377 + "HID:WIZARDS_HID_DLGREPORT_5_CHKLINKTODB", // HID:34378 + "", + "", + "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_1", // HID:34381 + "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_2", // HID:34382 + "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_3", // HID:34383 + "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_4", // HID:34384 + "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_5", // HID:34385 + "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_6", // HID:34386 + "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_7", // HID:34387 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGFORM_DIALOG", // HID:34400 + "", + "HID:WIZARDS_HID_DLGFORM_CMDPREV", // HID:34402 + "HID:WIZARDS_HID_DLGFORM_CMDNEXT", // HID:34403 + "HID:WIZARDS_HID_DLGFORM_CMDFINISH", // HID:34404 + "HID:WIZARDS_HID_DLGFORM_CMDCANCEL", // HID:34405 + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGFORM_MASTER_LBTABLES", // HID:34411 + "HID:WIZARDS_HID_DLGFORM_MASTER_FIELDSAVAILABLE", // HID:34412 + "HID:WIZARDS_HID_DLGFORM_MASTER_CMDMOVESELECTED", // HID:34413 + "HID:WIZARDS_HID_DLGFORM_MASTER_CMDMOVEALL", // HID:34414 + "HID:WIZARDS_HID_DLGFORM_MASTER_CMDREMOVESELECTED", // HID:34415 + "HID:WIZARDS_HID_DLGFORM_MASTER_CMDREMOVEALL", // HID:34416 + "HID:WIZARDS_HID_DLGFORM_MASTER_FIELDSSELECTED", // HID:34417 + "HID:WIZARDS_HID_DLGFORM_MASTER_CMDMOVEUP", // HID:34418 + "HID:WIZARDS_HID_DLGFORM_MASTER_CMDMOVEDOWN", // HID:34419 + "", + "HID:WIZARDS_HID_DLGFORM_CHKCREATESUBFORM", // HID:34421 + "HID:WIZARDS_HID_DLGFORM_OPTONEXISTINGRELATION", // HID:34422 + "HID:WIZARDS_HID_DLGFORM_OPTSELECTMANUALLY", // HID:34423 + "HID:WIZARDS_HID_DLGFORM_lstRELATIONS", // HID:34424 + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGFORM_SUB_LBTABLES", // HID:34431 + "HID:WIZARDS_HID_DLGFORM_SUB_FIELDSAVAILABLE", // HID:34432 + "HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVESELECTED", // HID:34433 + "HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEALL", // HID:34434 + "HID:WIZARDS_HID_DLGFORM_SUB_CMDREMOVESELECTED", // HID:34435 + "HID:WIZARDS_HID_DLGFORM_SUB_CMDREMOVEALL", // HID:34436 + "HID:WIZARDS_HID_DLGFORM_SUB_FIELDSSELECTED", // HID:34437 + "HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEUP", // HID:34438 + "HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEDOWN", // HID:34439 + "", + "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK1", // HID:34441 + "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK1", // HID:34442 + "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK2", // HID:34443 + "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK2", // HID:34444 + "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK3", // HID:34445 + "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK3", // HID:34446 + "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK4", // HID:34447 + "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK4", // HID:34448 + "", + "", + "HID:WIZARDS_HID_DLGFORM_CMDALIGNLEFT", // HID:34451 + "HID:WIZARDS_HID_DLGFORM_CMDALIGNRIGHT", // HID:34452 + "HID:WIZARDS_HID_DLGFORM_CMDLEFTLABELED", // HID:34453 + "HID:WIZARDS_HID_DLGFORM_CMDTOPLABELED", // HID:34454 + "HID:WIZARDS_HID_DLGFORM_CMDTABLESTYLE", // HID:34455 + "HID:WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED", // HID:34456 + "HID:WIZARDS_HID_DLGFORM_CMDLEFTLABELED2", // HID:34457 + "HID:WIZARDS_HID_DLGFORM_CMDTOPLABELED2", // HID:34458 + "HID:WIZARDS_HID_DLGFORM_CMDTABLESTYLE2", // HID:34459 + "HID:WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED2", // HID:34460 + "HID:WIZARDS_HID_DLGFORM_OPTNEWDATAONLY", // HID:34461 + "HID:WIZARDS_HID_DLGFORM_OPTDISPLAYALLDATA", // HID:34462 + "HID:WIZARDS_HID_DLGFORM_CHKNOMODIFICATION", // HID:34463 + "HID:WIZARDS_HID_DLGFORM_CHKNODELETION", // HID:34464 + "HID:WIZARDS_HID_DLGFORM_CHKNOADDITION", // HID:34465 + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGFORM_LSTSTYLES", // HID:34471 + "HID:WIZARDS_HID_DLGFORM_CMDNOBORDER", // HID:34472 + "HID:WIZARDS_HID_DLGFORM_CMD3DBORDER", // HID:34473 + "HID:WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER", // HID:34474 + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGFORM_TXTPATH", // HID:34481 + "HID:WIZARDS_HID_DLGFORM_OPTWORKWITHFORM", // HID:34482 + "HID:WIZARDS_HID_DLGFORM_OPTMODIFYFORM", // HID:34483 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGNEWSLTR_DIALOG", // HID:34500 + "HID:WIZARDS_HID_DLGNEWSLTR_OPTSTANDARDLAYOUT", // HID:34501 + "HID:WIZARDS_HID_DLGNEWSLTR_OPTPARTYLAYOUT", // HID:34502 + "HID:WIZARDS_HID_DLGNEWSLTR_OPTBROCHURELAYOUT", // HID:34503 + "HID:WIZARDS_HID_DLGNEWSLTR_OPTSINGLESIDED", // HID:34504 + "HID:WIZARDS_HID_DLGNEWSLTR_OPTDOUBLESIDED", // HID:34505 + "HID:WIZARDS_HID_DLGNEWSLTR_CMDGOON", // HID:34506 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGDEPOT_DIALOG_SELLBUY", // HID:34520 + "HID:WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY", // HID:34521 + "HID:WIZARDS_HID_DLGDEPOT_0_TXTQUANTITY", // HID:34522 + "HID:WIZARDS_HID_DLGDEPOT_0_TXTRATE", // HID:34523 + "HID:WIZARDS_HID_DLGDEPOT_0_TXTDATE", // HID:34524 + "HID:WIZARDS_HID_DLGDEPOT_0_TXTCOMMISSION", // HID:34525 + "HID:WIZARDS_HID_DLGDEPOT_0_TXTFIX", // HID:34526 + "HID:WIZARDS_HID_DLGDEPOT_0_TXTMINIMUM", // HID:34527 + "HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SELLBUY", // HID:34528 + "HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_SELLBUY", // HID:34529 + "HID:WIZARDS_HID_DLGDEPOT_1_LSTSELLSTOCKS", // HID:34530 + "HID:WIZARDS_HID_DLGDEPOT_2_LSTBUYSTOCKS", // HID:34531 + "HID:WIZARDS_HID_DLGDEPOT_DIALOG_SPLIT", // HID:34532 + "HID:WIZARDS_HID_DLGDEPOT_0_LSTSTOCKNAMES", // HID:34533 + "HID:WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SPLIT", // HID:34534 + "HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SPLIT", // HID:34535 + "HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_SPLIT", // HID:34536 + "HID:WIZARDS_HID_DLGDEPOT_1_OPTPERSHARE", // HID:34537 + "HID:WIZARDS_HID_DLGDEPOT_1_OPTTOTAL", // HID:34538 + "HID:WIZARDS_HID_DLGDEPOT_1_TXTDIVIDEND", // HID:34539 + "HID:WIZARDS_HID_DLGDEPOT_2_TXTOLDRATE", // HID:34540 + "HID:WIZARDS_HID_DLGDEPOT_2_TXTNEWRATE", // HID:34541 + "HID:WIZARDS_HID_DLGDEPOT_2_TXTDATE", // HID:34542 + "HID:WIZARDS_HID_DLGDEPOT_3_TXTSTARTDATE", // HID:34543 + "HID:WIZARDS_HID_DLGDEPOT_3_TXTENDDATE", // HID:34544 + "HID:WIZARDS_HID_DLGDEPOT_3_OPTDAILY", // HID:34545 + "HID:WIZARDS_HID_DLGDEPOT_3_OPTWEEKLY", // HID:34546 + "HID:WIZARDS_HID_DLGDEPOT_DIALOG_HISTORY", // HID:34547 + "HID:WIZARDS_HID_DLGDEPOT_LSTMARKETS", // HID:34548 + "HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_HISTORY", // HID:34549 + "HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_HISTORY", // HID:34550 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGIMPORT_DIALOG", // HID:34570 + "HID:WIZARDS_HID_DLGIMPORT_0_CMDHELP", // HID:34571 + "HID:WIZARDS_HID_DLGIMPORT_0_CMDCANCEL", // HID:34572 + "HID:WIZARDS_HID_DLGIMPORT_0_CMDPREV", // HID:34573 + "HID:WIZARDS_HID_DLGIMPORT_0_CMDNEXT", // HID:34574 + "HID:WIZARDS_HID_DLGIMPORT_0_OPTSODOCUMENTS", // HID:34575 + "HID:WIZARDS_HID_DLGIMPORT_0_OPTMSDOCUMENTS", // HID:34576 + "HID:WIZARDS_HID_DLGIMPORT_0_CHKLOGFILE", // HID:34577 + "HID:WIZARDS_HID_DLGIMPORT_2_CHKWORD", // HID:34578 + "HID:WIZARDS_HID_DLGIMPORT_2_CHKEXCEL", // HID:34579 + "HID:WIZARDS_HID_DLGIMPORT_2_CHKPOWERPOINT", // HID:34580 + "HID:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATE", // HID:34581 + "HID:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATERECURSE", // HID:34582 + "HID:WIZARDS_HID_DLGIMPORT_2_LBTEMPLATEPATH", // HID:34583 + "HID:WIZARDS_HID_DLGIMPORT_2_EDTEMPLATEPATH", // HID:34584 + "HID:WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT", // HID:34585 + "HID:WIZARDS_HID_DLGIMPORT_2_CBDOCUMENT", // HID:34586 + "HID:WIZARDS_HID_DLGIMPORT_2_CBDOCUMENTRECURSE", // HID:34587 + "HID:WIZARDS_HID_DLGIMPORT_2_LBDOCUMENTPATH", // HID:34588 + "HID:WIZARDS_HID_DLGIMPORT_2_EDDOCUMENTPATH", // HID:34589 + "HID:WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT", // HID:34590 + "HID:WIZARDS_HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH", // HID:34591 + "HID:WIZARDS_HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH", // HID:34592 + "HID:WIZARDS_HID_DLGIMPORT_2_CMDEXPORTPATHSELECT", // HID:34593 + "", + "HID:WIZARDS_HID_DLGIMPORT_3_TBSUMMARY", // HID:34595 + "HID:WIZARDS_HID_DLGIMPORT_0_CHKWRITER", // HID:34596 + "HID:WIZARDS_HID_DLGIMPORT_0_CHKCALC", // HID:34597 + "HID:WIZARDS_HID_DLGIMPORT_0_CHKIMPRESS", // HID:34598 + "HID:WIZARDS_HID_DLGIMPORT_0_CHKMATHGLOBAL", // HID:34599 + "HID:WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2", // HID:34600 + "HID:WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2", // HID:34601 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGCORRESPONDENCE_DIALOG", // HID:34630 + "HID:WIZARDS_HID_DLGCORRESPONDENCE_CANCEL", // HID:34631 + "HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA1", // HID:34632 + "HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA2", // HID:34633 + "HID:WIZARDS_HID_DLGCORRESPONDENCE_AGENDAOKAY", // HID:34634 + "HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER1", // HID:34635 + "HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER2", // HID:34636 + "HID:WIZARDS_HID_DLGCORRESPONDENCE_LETTEROKAY", // HID:34637 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGSTYLES_DIALOG", // HID:34650 + "HID:WIZARDS_HID_DLGSTYLES_LISTBOX", // HID:34651 + "HID:WIZARDS_HID_DLGSTYLES_CANCEL", // HID:34652 + "HID:WIZARDS_HID_DLGSTYLES_OKAY", // HID:34653 + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGCONVERT_DIALOG", // HID:34660 + "HID:WIZARDS_HID_DLGCONVERT_CHECKBOX1", // HID:34661 + "HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON1", // HID:34662 + "HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON2", // HID:34663 + "HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON3", // HID:34664 + "HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON4", // HID:34665 + "HID:WIZARDS_HID_DLGCONVERT_LISTBOX1", // HID:34666 + "HID:WIZARDS_HID_DLGCONVERT_OBFILE", // HID:34667 + "HID:WIZARDS_HID_DLGCONVERT_OBDIR", // HID:34668 + "HID:WIZARDS_HID_DLGCONVERT_COMBOBOX1", // HID:34669 + "HID:WIZARDS_HID_DLGCONVERT_TBSOURCE", // HID:34670 + "HID:WIZARDS_HID_DLGCONVERT_CHECKRECURSIVE", // HID:34671 + "HID:WIZARDS_HID_DLGCONVERT_TBTARGET", // HID:34672 + "HID:WIZARDS_HID_DLGCONVERT_CBCANCEL", // HID:34673 + "HID:WIZARDS_HID_DLGCONVERT_CBHELP", // HID:34674 + "HID:WIZARDS_HID_DLGCONVERT_CBBACK", // HID:34675 + "HID:WIZARDS_HID_DLGCONVERT_CBGOON", // HID:34676 + "HID:WIZARDS_HID_DLGCONVERT_CBSOURCEOPEN", // HID:34677 + "HID:WIZARDS_HID_DLGCONVERT_CBTARGETOPEN", // HID:34678 + "HID:WIZARDS_HID_DLGCONVERT_CHKPROTECT", // HID:34679 + "HID:WIZARDS_HID_DLGCONVERT_CHKTEXTDOCUMENTS", // HID:34680 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGPASSWORD_CMDGOON", // HID:34690 + "HID:WIZARDS_HID_DLGPASSWORD_CMDCANCEL", // HID:34691 + "HID:WIZARDS_HID_DLGPASSWORD_CMDHELP", // HID:34692 + "HID:WIZARDS_HID_DLGPASSWORD_TXTPASSWORD", // HID:34693 + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGHOLIDAYCAL_DIALOG", // HID:34700 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_PREVIEW", // HID:34701 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_OPYEAR", // HID:34702 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_OPMONTH", // HID:34703 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_EDYEAR", // HID:34704 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_EDMONTH", // HID:34705 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_SPINYEAR", // HID:34706 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_SPINMONTH", // HID:34707 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_CMBSTATE", // HID:34708 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_LBOWNDATA", // HID:34709 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_CMDINSERT", // HID:34710 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_CMDDELETE", // HID:34711 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENT", // HID:34712 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_CHKEVENT", // HID:34713 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTDAY", // HID:34714 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTDAY", // HID:34715 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTMONTH", // HID:34716 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH", // HID:34717 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTYEAR", // HID:34718 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR", // HID:34719 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOWNDATA", // HID:34720 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDCANCEL", // HID:34721 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOK" // HID:34722 + }; + private static String array2[] = new String[] + { + "HID:WIZARDS_HID_LTRWIZ_OPTBUSINESSLETTER", // HID:40769 + "HID:WIZARDS_HID_LTRWIZ_OPTPRIVOFFICIALLETTER", // HID:40770 + "HID:WIZARDS_HID_LTRWIZ_OPTPRIVATELETTER", // HID:40771 + "HID:WIZARDS_HID_LTRWIZ_LSTBUSINESSSTYLE", // HID:40772 + "HID:WIZARDS_HID_LTRWIZ_CHKBUSINESSPAPER", // HID:40773 + "HID:WIZARDS_HID_LTRWIZ_LSTPRIVOFFICIALSTYLE", // HID:40774 + "HID:WIZARDS_HID_LTRWIZ_LSTPRIVATESTYLE", // HID:40775 + "HID:WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYLOGO", // HID:40776 + "HID:WIZARDS_HID_LTRWIZ_NUMLOGOHEIGHT", // HID:40777 + "HID:WIZARDS_HID_LTRWIZ_NUMLOGOX", // HID:40778 + "HID:WIZARDS_HID_LTRWIZ_NUMLOGOWIDTH", // HID:40779 + "HID:WIZARDS_HID_LTRWIZ_NUMLOGOY", // HID:40780 + "HID:WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYADDRESS", // HID:40781 + "HID:WIZARDS_HID_LTRWIZ_NUMADDRESSHEIGHT", // HID:40782 + "HID:WIZARDS_HID_LTRWIZ_NUMADDRESSX", // HID:40783 + "HID:WIZARDS_HID_LTRWIZ_NUMADDRESSWIDTH", // HID:40784 + "HID:WIZARDS_HID_LTRWIZ_NUMADDRESSY", // HID:40785 + "HID:WIZARDS_HID_LTRWIZ_CHKCOMPANYRECEIVER", // HID:40786 + "HID:WIZARDS_HID_LTRWIZ_CHKPAPERFOOTER", // HID:40787 + "HID:WIZARDS_HID_LTRWIZ_NUMFOOTERHEIGHT", // HID:40788 + "HID:WIZARDS_HID_LTRWIZ_LSTLETTERNORM", // HID:40789 + "HID:WIZARDS_HID_LTRWIZ_CHKUSELOGO", // HID:40790 + "HID:WIZARDS_HID_LTRWIZ_CHKUSEADDRESSRECEIVER", // HID:40791 + "HID:WIZARDS_HID_LTRWIZ_CHKUSESIGNS", // HID:40792 + "HID:WIZARDS_HID_LTRWIZ_CHKUSESUBJECT", // HID:40793 + "HID:WIZARDS_HID_LTRWIZ_CHKUSESALUTATION", // HID:40794 + "HID:WIZARDS_HID_LTRWIZ_LSTSALUTATION", // HID:40795 + "HID:WIZARDS_HID_LTRWIZ_CHKUSEBENDMARKS", // HID:40796 + "HID:WIZARDS_HID_LTRWIZ_CHKUSEGREETING", // HID:40797 + "HID:WIZARDS_HID_LTRWIZ_LSTGREETING", // HID:40798 + "HID:WIZARDS_HID_LTRWIZ_CHKUSEFOOTER", // HID:40799 + "HID:WIZARDS_HID_LTRWIZ_OPTSENDERPLACEHOLDER", // HID:40800 + "HID:WIZARDS_HID_LTRWIZ_OPTSENDERDEFINE", // HID:40801 + "HID:WIZARDS_HID_LTRWIZ_TXTSENDERNAME", // HID:40802 + "HID:WIZARDS_HID_LTRWIZ_TXTSENDERSTREET", // HID:40803 + "HID:WIZARDS_HID_LTRWIZ_TXTSENDERPOSTCODE", // HID:40804 + "HID:WIZARDS_HID_LTRWIZ_TXTSENDERSTATE_TEXT", // HID:40805 + "HID:WIZARDS_HID_LTRWIZ_TXTSENDERCITY", // HID:40806 + "HID:WIZARDS_HID_LTRWIZ_OPTRECEIVERPLACEHOLDER", // HID:40807 + "HID:WIZARDS_HID_LTRWIZ_OPTRECEIVERDATABASE", // HID:40808 + "HID:WIZARDS_HID_LTRWIZ_TXTFOOTER", // HID:40809 + "HID:WIZARDS_HID_LTRWIZ_CHKFOOTERNEXTPAGES", // HID:40810 + "HID:WIZARDS_HID_LTRWIZ_CHKFOOTERPAGENUMBERS", // HID:40811 + "HID:WIZARDS_HID_LTRWIZ_TXTTEMPLATENAME", // HID:40812 + "HID:WIZARDS_HID_LTRWIZ_OPTCREATELETTER", // HID:40813 + "HID:WIZARDS_HID_LTRWIZ_OPTMAKECHANGES", // HID:40814 + "HID:WIZARDS_HID_LTRWIZ_TXTPATH", // HID:40815 + "HID:WIZARDS_HID_LTRWIZ_CMDPATH", // HID:40816 + "", + "", + "", + "HID:WIZARDS_HID_LTRWIZARD", // HID:40820 + "HID:WIZARDS_HID_LTRWIZARD_HELP", // HID:40821 + "HID:WIZARDS_HID_LTRWIZARD_BACK", // HID:40822 + "HID:WIZARDS_HID_LTRWIZARD_NEXT", // HID:40823 + "HID:WIZARDS_HID_LTRWIZARD_CREATE", // HID:40824 + "HID:WIZARDS_HID_LTRWIZARD_CANCEL", // HID:40825 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_QUERYWIZARD_LSTTABLES", // HID:40850 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFIELDS", // HID:40851 + "HID:WIZARDS_HID_QUERYWIZARD_CMDMOVESELECTED", // HID:40852 + "HID:WIZARDS_HID_QUERYWIZARD_CMDMOVEALL", // HID:40853 + "HID:WIZARDS_HID_QUERYWIZARD_CMDREMOVESELECTED", // HID:40854 + "HID:WIZARDS_HID_QUERYWIZARD_CMDREMOVEALL", // HID:40855 + "HID:WIZARDS_HID_QUERYWIZARD_LSTSELFIELDS", // HID:40856 + "HID:WIZARDS_HID_QUERYWIZARD_CMDMOVEUP", // HID:40857 + "HID:WIZARDS_HID_QUERYWIZARD_CMDMOVEDOWN", // HID:40858 + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_QUERYWIZARD_SORT1", // HID:40865 + "HID:WIZARDS_HID_QUERYWIZARD_OPTASCEND1", // HID:40866 + "HID:WIZARDS_HID_QUERYWIZARD_OPTDESCEND1", // HID:40867 + "HID:WIZARDS_HID_QUERYWIZARD_SORT2", // HID:40868 + "HID:WIZARDS_HID_QUERYWIZARD_OPTASCEND2", // HID:40869 + "HID:WIZARDS_HID_QUERYWIZARD_OPTDESCEND2", // HID:40870 + "HID:WIZARDS_HID_QUERYWIZARD_SORT3", // HID:40871 + "HID:WIZARDS_HID_QUERYWIZARD_OPTASCEND3", // HID:40872 + "HID:WIZARDS_HID_QUERYWIZARD_OPTDESCEND3", // HID:40873 + "HID:WIZARDS_HID_QUERYWIZARD_SORT4", // HID:40874 + "HID:WIZARDS_HID_QUERYWIZARD_OPTASCEND4", // HID:40875 + "HID:WIZARDS_HID_QUERYWIZARD_OPTDESCEND4", // HID:40876 + "", + "HID:WIZARDS_HID_QUERYWIZARD_OPTMATCHALL", // HID:40878 + "HID:WIZARDS_HID_QUERYWIZARD_OPTMATCHANY", // HID:40879 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_1", // HID:40880 + "HID:WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_1", // HID:40881 + "HID:WIZARDS_HID_QUERYWIZARD_TXTVALUE_1", // HID:40882 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_2", // HID:40883 + "HID:WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_2", // HID:40884 + "HID:WIZARDS_HID_QUERYWIZARD_TXTVALUE_2", // HID:40885 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_3", // HID:40886 + "HID:WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_3", // HID:40887 + "HID:WIZARDS_HID_QUERYWIZARD_TXTVALUE_3", // HID:40888 + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY", // HID:40895 + "HID:WIZARDS_HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY", // HID:40896 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1", // HID:40897 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1", // HID:40898 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2", // HID:40899 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2", // HID:40900 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3", // HID:40901 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3", // HID:40902 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4", // HID:40903 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4", // HID:40904 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5", // HID:40905 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5", // HID:40906 + "HID:WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEPLUS", // HID:40907 + "HID:WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEMINUS", // HID:40908 + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDS", // HID:40915 + "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVESELECTED", // HID:40916 + "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERREMOVESELECTED", // HID:40917 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERSELFIELDS", // HID:40918 + "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEUP", // HID:40919 + "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEDOWN", // HID:40920 + "", + "", + "HID:WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHALL", // HID:40923 + "HID:WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHANY", // HID:40924 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_1", // HID:40925 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_1", // HID:40926 + "HID:WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_1", // HID:40927 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_2", // HID:40928 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_2", // HID:40929 + "HID:WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_2", // HID:40930 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_3", // HID:40931 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_3", // HID:40932 + "HID:WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_3", // HID:40933 + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_1", // HID:40940 + "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_2", // HID:40941 + "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_3", // HID:40942 + "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_4", // HID:40943 + "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_5", // HID:40944 + "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_6", // HID:40945 + "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_7", // HID:40946 + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_QUERYWIZARD_TXTQUERYTITLE", // HID:40955 + "HID:WIZARDS_HID_QUERYWIZARD_OPTDISPLAYQUERY", // HID:40956 + "HID:WIZARDS_HID_QUERYWIZARD_OPTMODIFYQUERY", // HID:40957 + "HID:WIZARDS_HID_QUERYWIZARD_TXTSUMMARY", // HID:40958 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_QUERYWIZARD", // HID:40970 + "", + "HID:WIZARDS_HID_QUERYWIZARD_BACK", // HID:40972 + "HID:WIZARDS_HID_QUERYWIZARD_NEXT", // HID:40973 + "HID:WIZARDS_HID_QUERYWIZARD_CREATE", // HID:40974 + "HID:WIZARDS_HID_QUERYWIZARD_CANCEL", // HID:40975 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_IS", // HID:41000 + "", + "HID:WIZARDS_HID_IS_BTN_NONE", // HID:41002 + "HID:WIZARDS_HID_IS_BTN_OK", // HID:41003 + "HID:WIZARDS_HID_IS_BTN_CANCEL", // HID:41004 + "HID:WIZARDS_HID_IS_BTN_IMG1", // HID:41005 + "HID:WIZARDS_HID_IS_BTN_IMG2", // HID:41006 + "HID:WIZARDS_HID_IS_BTN_IMG3", // HID:41007 + "HID:WIZARDS_HID_IS_BTN_IMG4", // HID:41008 + "HID:WIZARDS_HID_IS_BTN_IMG5", // HID:41009 + "HID:WIZARDS_HID_IS_BTN_IMG6", // HID:41010 + "HID:WIZARDS_HID_IS_BTN_IMG7", // HID:41011 + "HID:WIZARDS_HID_IS_BTN_IMG8", // HID:41012 + "HID:WIZARDS_HID_IS_BTN_IMG9", // HID:41013 + "HID:WIZARDS_HID_IS_BTN_IMG10", // HID:41014 + "HID:WIZARDS_HID_IS_BTN_IMG11", // HID:41015 + "HID:WIZARDS_HID_IS_BTN_IMG12", // HID:41016 + "HID:WIZARDS_HID_IS_BTN_IMG13", // HID:41017 + "HID:WIZARDS_HID_IS_BTN_IMG14", // HID:41018 + "HID:WIZARDS_HID_IS_BTN_IMG15", // HID:41019 + "HID:WIZARDS_HID_IS_BTN_IMG16", // HID:41020 + "HID:WIZARDS_HID_IS_BTN_IMG17", // HID:41021 + "HID:WIZARDS_HID_IS_BTN_IMG18", // HID:41022 + "HID:WIZARDS_HID_IS_BTN_IMG19", // HID:41023 + "HID:WIZARDS_HID_IS_BTN_IMG20", // HID:41024 + "HID:WIZARDS_HID_IS_BTN_IMG21", // HID:41025 + "HID:WIZARDS_HID_IS_BTN_IMG22", // HID:41026 + "HID:WIZARDS_HID_IS_BTN_IMG23", // HID:41027 + "HID:WIZARDS_HID_IS_BTN_IMG24", // HID:41028 + "HID:WIZARDS_HID_IS_BTN_IMG25", // HID:41029 + "HID:WIZARDS_HID_IS_BTN_IMG26", // HID:41030 + "HID:WIZARDS_HID_IS_BTN_IMG27", // HID:41031 + "HID:WIZARDS_HID_IS_BTN_IMG28", // HID:41032 + "HID:WIZARDS_HID_IS_BTN_IMG29", // HID:41033 + "HID:WIZARDS_HID_IS_BTN_IMG30", // HID:41034 + "HID:WIZARDS_HID_IS_BTN_IMG31", // HID:41035 + "HID:WIZARDS_HID_IS_BTN_IMG32", // HID:41036 + "", + "", + "", + "HID:WIZARDS_HID_FTP", // HID:41040 + "HID:WIZARDS_HID_FTP_SERVER", // HID:41041 + "HID:WIZARDS_HID_FTP_USERNAME", // HID:41042 + "HID:WIZARDS_HID_FTP_PASS", // HID:41043 + "HID:WIZARDS_HID_FTP_TEST", // HID:41044 + "HID:WIZARDS_HID_FTP_TXT_PATH", // HID:41045 + "HID:WIZARDS_HID_FTP_BTN_PATH", // HID:41046 + "HID:WIZARDS_HID_FTP_OK", // HID:41047 + "HID:WIZARDS_HID_FTP_CANCEL", // HID:41048 + "", + "", + "HID:WIZARDS_HID_AGWIZ", // HID:41051 + "HID:WIZARDS_HID_AGWIZ_HELP", // HID:41052 + "HID:WIZARDS_HID_AGWIZ_NEXT", // HID:41053 + "HID:WIZARDS_HID_AGWIZ_PREV", // HID:41054 + "HID:WIZARDS_HID_AGWIZ_CREATE", // HID:41055 + "HID:WIZARDS_HID_AGWIZ_CANCEL", // HID:41056 + "HID:WIZARDS_HID_AGWIZ_1_LIST_PAGEDESIGN", // HID:41057 + "HID:WIZARDS_HID_AGWIZ_1_CHK_MINUTES", // HID:41058 + "HID:WIZARDS_HID_AGWIZ_2_TXT_TIME", // HID:41059 + "HID:WIZARDS_HID_AGWIZ_2_TXT_DATE", // HID:41060 + "HID:WIZARDS_HID_AGWIZ_2_TXT_TITLE", // HID:41061 + "HID:WIZARDS_HID_AGWIZ_2_TXT_LOCATION", // HID:41062 + "HID:WIZARDS_HID_AGWIZ_3_CHK_MEETING_TYPE", // HID:41063 + "HID:WIZARDS_HID_AGWIZ_3_CHK_READ", // HID:41064 + "HID:WIZARDS_HID_AGWIZ_3_CHK_BRING", // HID:41065 + "HID:WIZARDS_HID_AGWIZ_3_CHK_NOTES", // HID:41066 + "HID:WIZARDS_HID_AGWIZ_4_CHK_CALLED_BY", // HID:41067 + "HID:WIZARDS_HID_AGWIZ_4_CHK_FACILITATOR", // HID:41068 + "HID:WIZARDS_HID_AGWIZ_4_CHK_NOTETAKER", // HID:41069 + "HID:WIZARDS_HID_AGWIZ_4_CHK_TIMEKEEPER", // HID:41070 + "HID:WIZARDS_HID_AGWIZ_4_CHK_ATTENDEES", // HID:41071 + "HID:WIZARDS_HID_AGWIZ_4_CHK_OBSERVERS", // HID:41072 + "HID:WIZARDS_HID_AGWIZ_4_CHK_RESOURCEPERSONS", // HID:41073 + "HID:WIZARDS_HID_AGWIZ_6_TXT_TEMPLATENAME", // HID:41074 + "HID:WIZARDS_HID_AGWIZ_6_TXT_TEMPLATEPATH", // HID:41075 + "HID:WIZARDS_HID_AGWIZ_6_BTN_TEMPLATEPATH", // HID:41076 + "HID:WIZARDS_HID_AGWIZ_6_OPT_CREATEAGENDA", // HID:41077 + "HID:WIZARDS_HID_AGWIZ_6_OPT_MAKECHANGES", // HID:41078 + "HID:WIZARDS_HID_AGWIZ_5_BTN_INSERT", // HID:41079 + "HID:WIZARDS_HID_AGWIZ_5_BTN_REMOVE", // HID:41080 + "HID:WIZARDS_HID_AGWIZ_5_BTN_UP", // HID:41081 + "HID:WIZARDS_HID_AGWIZ_5_BTN_DOWN", // HID:41082 + "HID:WIZARDS_HID_AGWIZ_5_SCROLL_BAR", // HID:41083 + "HID:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_1", // HID:41084 + "HID:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_1", // HID:41085 + "HID:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_1", // HID:41086 + "HID:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_2", // HID:41087 + "HID:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_2", // HID:41088 + "HID:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_2", // HID:41089 + "HID:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_3", // HID:41090 + "HID:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_3", // HID:41091 + "HID:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_3", // HID:41092 + "HID:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_4", // HID:41093 + "HID:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_4", // HID:41094 + "HID:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_4", // HID:41095 + "HID:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_5", // HID:41096 + "HID:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_5", // HID:41097 + "HID:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_5", // HID:41098 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_FAXWIZ_OPTBUSINESSFAX", // HID:41120 + "HID:WIZARDS_HID_FAXWIZ_LSTBUSINESSSTYLE", // HID:41121 + "HID:WIZARDS_HID_FAXWIZ_OPTPRIVATEFAX", // HID:41122 + "HID:WIZARDS_HID_LSTPRIVATESTYLE", // HID:41123 + "HID:WIZARDS_HID_IMAGECONTROL3", // HID:41124 + "HID:WIZARDS_HID_CHKUSELOGO", // HID:41125 + "HID:WIZARDS_HID_CHKUSEDATE", // HID:41126 + "HID:WIZARDS_HID_CHKUSECOMMUNICATIONTYPE", // HID:41127 + "HID:WIZARDS_HID_LSTCOMMUNICATIONTYPE", // HID:41128 + "HID:WIZARDS_HID_CHKUSESUBJECT", // HID:41129 + "HID:WIZARDS_HID_CHKUSESALUTATION", // HID:41130 + "HID:WIZARDS_HID_LSTSALUTATION", // HID:41131 + "HID:WIZARDS_HID_CHKUSEGREETING", // HID:41132 + "HID:WIZARDS_HID_LSTGREETING", // HID:41133 + "HID:WIZARDS_HID_CHKUSEFOOTER", // HID:41134 + "HID:WIZARDS_HID_OPTSENDERPLACEHOLDER", // HID:41135 + "HID:WIZARDS_HID_OPTSENDERDEFINE", // HID:41136 + "HID:WIZARDS_HID_TXTSENDERNAME", // HID:41137 + "HID:WIZARDS_HID_TXTSENDERSTREET", // HID:41138 + "HID:WIZARDS_HID_TXTSENDERPOSTCODE", // HID:41139 + "HID:WIZARDS_HID_TXTSENDERSTATE", // HID:41140 + "HID:WIZARDS_HID_TXTSENDERCITY", // HID:41141 + "HID:WIZARDS_HID_TXTSENDERFAX", // HID:41142 + "HID:WIZARDS_HID_OPTRECEIVERPLACEHOLDER", // HID:41143 + "HID:WIZARDS_HID_OPTRECEIVERDATABASE", // HID:41144 + "HID:WIZARDS_HID_TXTFOOTER", // HID:41145 + "HID:WIZARDS_HID_CHKFOOTERNEXTPAGES", // HID:41146 + "HID:WIZARDS_HID_CHKFOOTERPAGENUMBERS", // HID:41147 + "HID:WIZARDS_HID_TXTTEMPLATENAME", // HID:41148 + "HID:WIZARDS_HID_FILETEMPLATEPATH", // HID:41149 + "HID:WIZARDS_HID_OPTCREATEFAX", // HID:41150 + "HID:WIZARDS_HID_OPTMAKECHANGES", // HID:41151 + "HID:WIZARDS_HID_IMAGECONTROL2", // HID:41152 + "HID:WIZARDS_HID_FAXWIZ_TXTPATH", // HID:41153 + "HID:WIZARDS_HID_FAXWIZ_CMDPATH", // HID:41154 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_FAXWIZARD", // HID:41180 + "HID:WIZARDS_HID_FAXWIZARD_HELP", // HID:41181 + "HID:WIZARDS_HID_FAXWIZARD_BACK", // HID:41182 + "HID:WIZARDS_HID_FAXWIZARD_NEXT", // HID:41183 + "HID:WIZARDS_HID_FAXWIZARD_CREATE", // HID:41184 + "HID:WIZARDS_HID_FAXWIZARD_CANCEL", // HID:41185 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGTABLE_DIALOG", // HID:41200 + "", + "HID:WIZARDS_HID_DLGTABLE_CMDPREV", // HID:41202 + "HID:WIZARDS_HID_DLGTABLE_CMDNEXT", // HID:41203 + "HID:WIZARDS_HID_DLGTABLE_CMDFINISH", // HID:41204 + "HID:WIZARDS_HID_DLGTABLE_CMDCANCEL", // HID:41205 + "HID:WIZARDS_HID_DLGTABLE_OPTBUSINESS", // HID:41206 + "HID:WIZARDS_HID_DLGTABLE_OPTPRIVATE", // HID:41207 + "HID:WIZARDS_HID_DLGTABLE_LBTABLES", // HID:41208 + "HID:WIZARDS_HID_DLGTABLE_FIELDSAVAILABLE", // HID:41209 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVESELECTED", // HID:41210 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVEALL", // HID:41211 + "HID:WIZARDS_HID_DLGTABLE_CMDREMOVESELECTED", // HID:41212 + "HID:WIZARDS_HID_DLGTABLE_CMDREMOVEALL", // HID:41213 + "HID:WIZARDS_HID_DLGTABLE_FIELDSSELECTED", // HID:41214 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVEUP", // HID:41215 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVEDOWN", // HID:41216 + "", + "", + "", + "HID:WIZARDS_HID_DLGTABLE_LB_SELFIELDNAMES", // HID:41220 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDUP", // HID:41221 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDDOWN", // HID:41222 + "HID:WIZARDS_HID_DLGTABLE_CMDMINUS", // HID:41223 + "HID:WIZARDS_HID_DLGTABLE_CMDPLUS", // HID:41224 + "HID:WIZARDS_HID_DLGTABLE_COLNAME", // HID:41225 + "HID:WIZARDS_HID_DLGTABLE_COLMODIFIER", // HID:41226 + "HID:WIZARDS_HID_DLGTABLE_CHK_USEPRIMEKEY", // HID:41227 + "HID:WIZARDS_HID_DLGTABLE_OPT_PK_AUTOMATIC", // HID:41228 + "HID:WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC", // HID:41229 + "HID:WIZARDS_HID_DLGTABLE_OPT_PK_SINGLE", // HID:41230 + "HID:WIZARDS_HID_DLGTABLE_LB_PK_FIELDNAME", // HID:41231 + "HID:WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE", // HID:41232 + "HID:WIZARDS_HID_DLGTABLE_OPT_PK_SEVERAL", // HID:41233 + "HID:WIZARDS_HID_DLGTABLE_FIELDS_PK_AVAILABLE", // HID:41234 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVE_PK_SELECTED", // HID:41235 + "HID:WIZARDS_HID_DLGTABLE_CMDREMOVE_PK_SELECTED", // HID:41236 + "HID:WIZARDS_HID_DLGTABLE_FIELDS_PK_SELECTED", // HID:41237 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVEUP_PK_SELECTED", // HID:41238 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED", // HID:41239 + "HID:WIZARDS_HID_DLGTABLE_TXT_NAME", // HID:41240 + "HID:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE", // HID:41241 + "HID:WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE", // HID:41242 + "HID:WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD", // HID:41243 + "HID:WIZARDS_HID_DLGTABLE_LST_CATALOG", // HID:41244 + "HID:WIZARDS_HID_DLGTABLE_LST_SCHEMA" // HID:41245 + }; + + public static String getHelpIdString( int nHelpId ) + { + if ( nHelpId >= 34200 && nHelpId <= 34722 ) + return array1[ nHelpId - 34200 ]; + else if ( nHelpId >= 40769 && nHelpId <= 41245 ) + return array2[ nHelpId - 40769 ]; + else + return new String(); + } +} diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java index cff3736b9..2fceae708 100644 --- a/wizards/com/sun/star/wizards/db/DBMetaData.java +++ b/wizards/com/sun/star/wizards/db/DBMetaData.java @@ -38,12 +38,10 @@ import com.sun.star.awt.XWindowPeer; import com.sun.star.beans.PropertyValue; import com.sun.star.beans.UnknownPropertyException; import com.sun.star.beans.XPropertySet; -import com.sun.star.container.XChild; import com.sun.star.container.XHierarchicalNameAccess; import com.sun.star.container.XHierarchicalNameContainer; import com.sun.star.container.XNameAccess; import com.sun.star.container.XNameContainer; -import com.sun.star.frame.XComponentLoader; import com.sun.star.frame.XModel; import com.sun.star.frame.XStorable; import com.sun.star.lang.XComponent; @@ -91,7 +89,6 @@ import java.util.logging.Logger; public class DBMetaData { - private XNameAccess xQueryNames; public XDatabaseMetaData xDBMetaData; private XDataSource m_dataSource; @@ -109,12 +106,8 @@ public class DBMetaData public com.sun.star.lang.XMultiServiceFactory xMSF; public XComponent xConnectionComponent; - private XNameAccess m_xTableNames; - private XInteractionHandler oInteractionHandler; private XNameAccess xNameAccess; private XInterface xDatabaseContext; - private XCompletedConnection xCompleted; - // private int[] nDataTypes = null; private XWindowPeer xWindowPeer; private String[] TableNames = new String[] {}; private String[] QueryNames = new String[] {}; @@ -212,15 +205,13 @@ public class DBMetaData return lDateCorrection; } - void getInterfaces(XMultiServiceFactory xMSF) + private void getInterfaces(XMultiServiceFactory xMSF) { try { this.xMSF = xMSF; xDatabaseContext = (XInterface) xMSF.createInstance("com.sun.star.sdb.DatabaseContext"); xNameAccess = UnoRuntime.queryInterface( XNameAccess.class, xDatabaseContext ); - XInterface xInteractionHandler = (XInterface) xMSF.createInstance("com.sun.star.task.InteractionHandler"); - oInteractionHandler = UnoRuntime.queryInterface( XInteractionHandler.class, xInteractionHandler ); DataSourceNames = xNameAccess.getElementNames(); } catch (Exception exception) @@ -257,7 +248,6 @@ public class DBMetaData public boolean hasTableByName(String _stablename) { - // getTableNames(); return getTableNamesAsNameAccess().hasByName(_stablename); } @@ -371,11 +361,6 @@ public class DBMetaData return bHasEscapeProcessing; } - // public void initCommandNames() - // { - // getTableNames(); - // } - public XNameAccess getQueryNamesAsNameAccess() { XQueriesSupplier xDBQueries = UnoRuntime.queryInterface( XQueriesSupplier.class, DBConnection ); @@ -416,7 +401,7 @@ public class DBMetaData return TableNames; } - void InitializeWidthList() + private void InitializeWidthList() { WidthList = new int[17][2]; WidthList[0][0] = DataType.BIT; // == -7; @@ -581,7 +566,7 @@ public class DBMetaData return m_dataSource; } - private void setDataSourceByName(String _DataSourceName, boolean bgetInterfaces) + private void setDataSourceByName(String _DataSourceName) { try { @@ -601,7 +586,6 @@ public class DBMetaData public void getDataSourceInterfaces() throws Exception { - xCompleted = UnoRuntime.queryInterface( XCompletedConnection.class, getDataSource() ); xDataSourcePropertySet = UnoRuntime.queryInterface( XPropertySet.class, getDataSource() ); bPasswordIsRequired = ((Boolean) xDataSourcePropertySet.getPropertyValue("IsPasswordRequired")).booleanValue(); } @@ -684,8 +668,8 @@ public class DBMetaData private boolean getConnection(String _DataSourceName) { - setDataSourceByName(_DataSourceName, true); - return getConnection( getDataSource() ); + setDataSourceByName(_DataSourceName); + return getConnection( getDataSource() ); } private boolean getConnection(com.sun.star.sdbc.XConnection _DBConnection) @@ -955,7 +939,7 @@ public class DBMetaData NamedValueCollection creationArgs = new NamedValueCollection(); creationArgs.put( "Name", basename ); creationArgs.put( "URL", documentURL ); - creationArgs.put( "AsTemplate", new Boolean( i_createTemplate ) ); + creationArgs.put( "AsTemplate", i_createTemplate ); XMultiServiceFactory xDocMSF = UnoRuntime.queryInterface( XMultiServiceFactory.class, _xDocNameAccess ); Object oDBDocument = xDocMSF.createInstanceWithArguments( "com.sun.star.sdb.DocumentDefinition", creationArgs.getPropertyValues() ); XHierarchicalNameContainer xHier = UnoRuntime.queryInterface( XHierarchicalNameContainer.class, _xDocNameAccess ); @@ -967,7 +951,7 @@ public class DBMetaData } catch (Exception e) { - e.printStackTrace(System.out); + e.printStackTrace(); } } @@ -1103,13 +1087,11 @@ public class DBMetaData public void finish() { xQueryNames = null; - oInteractionHandler = null; xNameAccess = null; xDatabaseContext = null; xDBMetaData = null; m_dataSource = null; xModel = null; - xCompleted = null; xDataSourcePropertySet = null; xWindowPeer = null; DBConnection = null; diff --git a/wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java b/wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java index 5c65d7379..e03323c6e 100644 --- a/wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java +++ b/wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java @@ -57,7 +57,8 @@ public abstract class DatabaseObjectWizard extends WizardDialog { try { - m_docUI.loadComponent( i_type, i_name, i_forEditing ); + if ( m_docUI != null ) + m_docUI.loadComponent( i_type, i_name, i_forEditing ); } catch ( IllegalArgumentException ex ) { diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java index a80623e27..b474c6a5b 100644 --- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java +++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java @@ -47,6 +47,7 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.sdbc.SQLException; import com.sun.star.lang.XInitialization; import com.sun.star.awt.XWindow; +import com.sun.star.sdb.SQLFilterOperator; import com.sun.star.wizards.common.*; @@ -60,7 +61,7 @@ public class SQLQueryComposer // String m_sFromClause; public XSingleSelectQueryAnalyzer m_xQueryAnalyzer; Vector composedCommandNames = new Vector(1); - private XSingleSelectQueryComposer m_xQueryComposer; + private XSingleSelectQueryComposer m_queryComposer; XMultiServiceFactory xMSF; boolean bincludeGrouping = true; @@ -72,7 +73,7 @@ public class SQLQueryComposer xMSF = (XMultiServiceFactory) UnoRuntime.queryInterface(XMultiServiceFactory.class, CurDBMetaData.DBConnection); final Object oQueryComposer = xMSF.createInstance("com.sun.star.sdb.SingleSelectQueryComposer"); m_xQueryAnalyzer = (XSingleSelectQueryAnalyzer) UnoRuntime.queryInterface(XSingleSelectQueryAnalyzer.class, oQueryComposer); - m_xQueryComposer = (XSingleSelectQueryComposer) UnoRuntime.queryInterface(XSingleSelectQueryComposer.class, m_xQueryAnalyzer); + m_queryComposer = (XSingleSelectQueryComposer) UnoRuntime.queryInterface(XSingleSelectQueryComposer.class, m_xQueryAnalyzer); XSQLQueryComposerFactory xSQLComposerFactory; xSQLComposerFactory = (XSQLQueryComposerFactory) UnoRuntime.queryInterface(XSQLQueryComposerFactory.class, CurDBMetaData.DBConnection); // /* XSQLQueryComposer */ xSQLQueryComposer = xSQLComposerFactory.createQueryComposer(); @@ -160,7 +161,7 @@ public class SQLQueryComposer { for (int i = 0; i < CurDBMetaData.getFilterConditions().length; i++) { - m_xQueryComposer.setStructuredFilter(CurDBMetaData.getFilterConditions()); + m_queryComposer.setStructuredFilter(CurDBMetaData.getFilterConditions()); } } catch (Exception exception) @@ -172,7 +173,7 @@ public class SQLQueryComposer public void prependSortingCriteria() throws SQLException { XIndexAccess xColumnIndexAccess = m_xQueryAnalyzer.getOrderColumns(); - m_xQueryComposer.setOrder(""); + m_queryComposer.setOrder(""); for (int i = 0; i < CurDBMetaData.getSortFieldNames().length; i++) { appendSortingCriterion(i, false); @@ -186,7 +187,7 @@ public class SQLQueryComposer if (JavaTools.FieldInTable(CurDBMetaData.getSortFieldNames(), sName) == -1) { boolean bascend = AnyConverter.toBoolean(xColumnPropertySet.getPropertyValue("IsAscending")); - m_xQueryComposer.appendOrderByColumn(xColumnPropertySet, bascend); + m_queryComposer.appendOrderByColumn(xColumnPropertySet, bascend); } } catch (Exception e) @@ -203,13 +204,13 @@ public class SQLQueryComposer String sSort = CurDBMetaData.getSortFieldNames()[_SortIndex][1]; boolean bascend = (sSort.equals("ASC")); - m_xQueryComposer.appendOrderByColumn(xColumn, bascend); + m_queryComposer.appendOrderByColumn(xColumn, bascend); } public void appendSortingcriteria(boolean _baddAliasFieldNames) throws SQLException { String sOrder = ""; - m_xQueryComposer.setOrder(""); + m_queryComposer.setOrder(""); for (int i = 0; i < CurDBMetaData.getSortFieldNames().length; i++) { String sSortValue = CurDBMetaData.getSortFieldNames()[i][0]; @@ -223,7 +224,7 @@ public class SQLQueryComposer } sOrder += CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + CurDBMetaData.AggregateFieldNames[iAggregate][0] + ")"; sOrder += " " + CurDBMetaData.getSortFieldNames()[i][1]; - m_xQueryComposer.setOrder(sOrder); + m_queryComposer.setOrder(sOrder); } else { @@ -232,7 +233,7 @@ public class SQLQueryComposer sOrder = m_xQueryAnalyzer.getOrder(); } // just for debug! - sOrder = m_xQueryComposer.getOrder(); + sOrder = m_queryComposer.getOrder(); int dummy = 0; } @@ -241,7 +242,7 @@ public class SQLQueryComposer for (int i = 0; i < CurDBMetaData.GroupFieldNames.length; i++) { XPropertySet xColumn = CurDBMetaData.getColumnObjectByFieldName(CurDBMetaData.GroupFieldNames[i], _baddAliasFieldNames); - m_xQueryComposer.appendGroupByColumn(xColumn); + m_queryComposer.appendGroupByColumn(xColumn); } String s = m_xQueryAnalyzer.getQuery(); } @@ -309,7 +310,7 @@ public class SQLQueryComposer if (CurDBMetaData.getFilterConditions().length > 0) { CurDBMetaData.setFilterConditions(replaceConditionsByAlias(CurDBMetaData.getFilterConditions())); - m_xQueryComposer.setStructuredFilter(CurDBMetaData.getFilterConditions()); + m_queryComposer.setStructuredFilter(CurDBMetaData.getFilterConditions()); } } } @@ -319,7 +320,7 @@ public class SQLQueryComposer appendGroupByColumns(_baddAliasFieldNames); if (CurDBMetaData.GroupByFilterConditions.length > 0) { - m_xQueryComposer.setStructuredHavingClause(CurDBMetaData.GroupByFilterConditions); + m_queryComposer.setStructuredHavingClause(CurDBMetaData.GroupByFilterConditions); } } appendSortingcriteria(_baddAliasFieldNames); @@ -426,8 +427,63 @@ public class SQLQueryComposer typeexception.printStackTrace(System.out); } } + + /** + * retrieves a normalized structured filter + * + * <p>XSingleSelectQueryComposer.getStructuredFilter has a strange habit of returning the predicate (equal, not equal, etc) + * effectively twice: Once as SQLFilterOperator, and once in the value. That is, if you have a term "column <> 3", then + * you'll get an SQLFilterOperator.NOT_EQUAL (which is fine), <strong>and</strong> the textual value of the condition + * will read "<> 3". The latter is strange enough, but even more strange is that this behavior is not even consistent: + * for SQLFilterOperator.EQUAL, the "=" sign is not include in the textual value.</p> + * + * <p>To abstract from this weirdness, use this function here, which strips the unwanted tokens from the textual value + * representation.</p> + */ + public PropertyValue[][] getNormalizedStructuredFilter() + { + final PropertyValue[][] structuredFilter = m_queryComposer.getStructuredFilter(); + for ( int i=0; i<structuredFilter.length; ++i ) + { + for ( int j=0; j<structuredFilter[i].length; ++j ) + { + if ( !( structuredFilter[i][j].Value instanceof String ) ) + continue; + final StringBuffer textualValue = new StringBuffer( (String)structuredFilter[i][j].Value ); + switch ( structuredFilter[i][j].Handle ) + { + case SQLFilterOperator.EQUAL: + break; + case SQLFilterOperator.NOT_EQUAL: + case SQLFilterOperator.LESS_EQUAL: + case SQLFilterOperator.GREATER_EQUAL: + textualValue.delete( 0, 2 ); + break; + case SQLFilterOperator.LESS: + case SQLFilterOperator.GREATER: + textualValue.delete( 0, 1 ); + break; + case SQLFilterOperator.NOT_LIKE: + textualValue.delete( 0, 8 ); + break; + case SQLFilterOperator.LIKE: + textualValue.delete( 0, 4 ); + break; + case SQLFilterOperator.SQLNULL: + textualValue.delete( 0, 7 ); + break; + case SQLFilterOperator.NOT_SQLNULL: + textualValue.delete( 0, 11 ); + break; + } + structuredFilter[i][j].Value = textualValue.toString().trim(); + } + } + return structuredFilter; + } + public XSingleSelectQueryComposer getQueryComposer() { - return m_xQueryComposer; + return m_queryComposer; } } diff --git a/wizards/com/sun/star/wizards/fax/CallWizard.java b/wizards/com/sun/star/wizards/fax/CallWizard.java index 0d04b0b94..d177a2100 100644 --- a/wizards/com/sun/star/wizards/fax/CallWizard.java +++ b/wizards/com/sun/star/wizards/fax/CallWizard.java @@ -41,8 +41,7 @@ import com.sun.star.uno.Type; /** * This class capsulates the class, that implements the minimal component, a factory for - * creating the service (<CODE>__getServiceFactory</CODE>) and a method, that writes the - * information into the given registry key (<CODE>__writeRegistryServiceInfo</CODE>). + * creating the service (<CODE>__getServiceFactory</CODE>). * * @author $author$ * @version $Revision: 1.3.192.1 $ @@ -78,22 +77,6 @@ public class CallWizard } /** - * Writes the service information into the given registry key. This method is called - * by the <code>JavaLoader</code>. - * - * @param xregistrykey Makes structural information (except regarding tree - * structures) of a single registry key accessible. - * - * @return returns true if the operation succeeded - * - * @see com.sun.star.comp.loader.JavaLoader# - */ - public static boolean __writeRegistryServiceInfo(XRegistryKey xregistrykey) - { - return FactoryHelper.writeRegistryServiceInfo(WizardImplementation.class.getName(), WizardImplementation.__serviceName, xregistrykey); - } - - /** * This class implements the component. At least the interfaces XServiceInfo, * XTypeProvider, and XInitialization should be provided by the service. */ diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java index af3abb57f..c82695b25 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java @@ -26,6 +26,7 @@ * ************************************************************************/ package com.sun.star.wizards.fax; +import com.sun.star.wizards.common.*; public interface FaxWizardDialogConst { @@ -78,38 +79,38 @@ public interface FaxWizardDialogConst */ public final static int HID = 41119; //TODO enter first hid here public static final int HIDMAIN = 41180; - public final String OPTBUSINESSFAX_HID = "HID:" + (HID + 1); - public final String LSTBUSINESSSTYLE_HID = "HID:" + (HID + 2); - public final String OPTPRIVATEFAX_HID = "HID:" + (HID + 3); - public final String LSTPRIVATESTYLE_HID = "HID:" + (HID + 4); - public final String IMAGECONTROL3_HID = "HID:" + (HID + 5); - public final String CHKUSELOGO_HID = "HID:" + (HID + 6); - public final String CHKUSEDATE_HID = "HID:" + (HID + 7); - public final String CHKUSECOMMUNICATIONTYPE_HID = "HID:" + (HID + 8); - public final String LSTCOMMUNICATIONTYPE_HID = "HID:" + (HID + 9); - public final String CHKUSESUBJECT_HID = "HID:" + (HID + 10); - public final String CHKUSESALUTATION_HID = "HID:" + (HID + 11); - public final String LSTSALUTATION_HID = "HID:" + (HID + 12); - public final String CHKUSEGREETING_HID = "HID:" + (HID + 13); - public final String LSTGREETING_HID = "HID:" + (HID + 14); - public final String CHKUSEFOOTER_HID = "HID:" + (HID + 15); - public final String OPTSENDERPLACEHOLDER_HID = "HID:" + (HID + 16); - public final String OPTSENDERDEFINE_HID = "HID:" + (HID + 17); - public final String TXTSENDERNAME_HID = "HID:" + (HID + 18); - public final String TXTSENDERSTREET_HID = "HID:" + (HID + 19); - public final String TXTSENDERPOSTCODE_HID = "HID:" + (HID + 20); - public final String TXTSENDERSTATE_HID = "HID:" + (HID + 21); - public final String TXTSENDERCITY_HID = "HID:" + (HID + 22); - public final String TXTSENDERFAX_HID = "HID:" + (HID + 23); - public final String OPTRECEIVERPLACEHOLDER_HID = "HID:" + (HID + 24); - public final String OPTRECEIVERDATABASE_HID = "HID:" + (HID + 25); - public final String TXTFOOTER_HID = "HID:" + (HID + 26); - public final String CHKFOOTERNEXTPAGES_HID = "HID:" + (HID + 27); - public final String CHKFOOTERPAGENUMBERS_HID = "HID:" + (HID + 28); - public final String TXTTEMPLATENAME_HID = "HID:" + (HID + 29); - public final String FILETEMPLATEPATH_HID = "HID:" + (HID + 30); - public final String OPTCREATEFAX_HID = "HID:" + (HID + 31); - public final String OPTMAKECHANGES_HID = "HID:" + (HID + 32); - public final String IMAGECONTROL2_HID = "HID:" + (HID + 33); + public final String OPTBUSINESSFAX_HID = HelpIds.getHelpIdString(HID + 1); + public final String LSTBUSINESSSTYLE_HID = HelpIds.getHelpIdString(HID + 2); + public final String OPTPRIVATEFAX_HID = HelpIds.getHelpIdString(HID + 3); + public final String LSTPRIVATESTYLE_HID = HelpIds.getHelpIdString(HID + 4); + public final String IMAGECONTROL3_HID = HelpIds.getHelpIdString(HID + 5); + public final String CHKUSELOGO_HID = HelpIds.getHelpIdString(HID + 6); + public final String CHKUSEDATE_HID = HelpIds.getHelpIdString(HID + 7); + public final String CHKUSECOMMUNICATIONTYPE_HID = HelpIds.getHelpIdString(HID + 8); + public final String LSTCOMMUNICATIONTYPE_HID = HelpIds.getHelpIdString(HID + 9); + public final String CHKUSESUBJECT_HID = HelpIds.getHelpIdString(HID + 10); + public final String CHKUSESALUTATION_HID = HelpIds.getHelpIdString(HID + 11); + public final String LSTSALUTATION_HID = HelpIds.getHelpIdString(HID + 12); + public final String CHKUSEGREETING_HID = HelpIds.getHelpIdString(HID + 13); + public final String LSTGREETING_HID = HelpIds.getHelpIdString(HID + 14); + public final String CHKUSEFOOTER_HID = HelpIds.getHelpIdString(HID + 15); + public final String OPTSENDERPLACEHOLDER_HID = HelpIds.getHelpIdString(HID + 16); + public final String OPTSENDERDEFINE_HID = HelpIds.getHelpIdString(HID + 17); + public final String TXTSENDERNAME_HID = HelpIds.getHelpIdString(HID + 18); + public final String TXTSENDERSTREET_HID = HelpIds.getHelpIdString(HID + 19); + public final String TXTSENDERPOSTCODE_HID = HelpIds.getHelpIdString(HID + 20); + public final String TXTSENDERSTATE_HID = HelpIds.getHelpIdString(HID + 21); + public final String TXTSENDERCITY_HID = HelpIds.getHelpIdString(HID + 22); + public final String TXTSENDERFAX_HID = HelpIds.getHelpIdString(HID + 23); + public final String OPTRECEIVERPLACEHOLDER_HID = HelpIds.getHelpIdString(HID + 24); + public final String OPTRECEIVERDATABASE_HID = HelpIds.getHelpIdString(HID + 25); + public final String TXTFOOTER_HID = HelpIds.getHelpIdString(HID + 26); + public final String CHKFOOTERNEXTPAGES_HID = HelpIds.getHelpIdString(HID + 27); + public final String CHKFOOTERPAGENUMBERS_HID = HelpIds.getHelpIdString(HID + 28); + public final String TXTTEMPLATENAME_HID = HelpIds.getHelpIdString(HID + 29); + public final String FILETEMPLATEPATH_HID = HelpIds.getHelpIdString(HID + 30); + public final String OPTCREATEFAX_HID = HelpIds.getHelpIdString(HID + 31); + public final String OPTMAKECHANGES_HID = HelpIds.getHelpIdString(HID + 32); + public final String IMAGECONTROL2_HID = HelpIds.getHelpIdString(HID + 33); } -
\ No newline at end of file + diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java index d904bc65e..4750b20a3 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java @@ -340,7 +340,7 @@ public class FaxWizardDialogImpl extends FaxWizardDialog public void insertPathSelectionControl() { myPathSelection = new PathSelection(xMSF, this, PathSelection.TransferMode.SAVE, PathSelection.DialogTypes.FILE); - myPathSelection.insert(5, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, "HID:" + (HID + 34), "HID:" + (HID + 35)); + myPathSelection.insert(5, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, HelpIds.getHelpIdString(HID + 34), HelpIds.getHelpIdString(HID + 35)); myPathSelection.sDefaultDirectory = sUserTemplatePath; myPathSelection.sDefaultName = "myFaxTemplate.ott"; myPathSelection.sDefaultFilter = "writer8_template"; diff --git a/wizards/com/sun/star/wizards/fax/fax.component b/wizards/com/sun/star/wizards/fax/fax.component new file mode 100644 index 000000000..462fe2901 --- /dev/null +++ b/wizards/com/sun/star/wizards/fax/fax.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Java2" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation + name="com.sun.star.wizards.fax.CallWizard$WizardImplementation"> + <service name="com.sun.star.wizards.fax.CallWizard"/> + </implementation> +</component> diff --git a/wizards/com/sun/star/wizards/fax/makefile.mk b/wizards/com/sun/star/wizards/fax/makefile.mk index 247aaf063..5cf089392 100644 --- a/wizards/com/sun/star/wizards/fax/makefile.mk +++ b/wizards/com/sun/star/wizards/fax/makefile.mk @@ -60,3 +60,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/fax.component + +$(MISC)/fax.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + fax.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt fax.component diff --git a/wizards/com/sun/star/wizards/form/CallFormWizard.java b/wizards/com/sun/star/wizards/form/CallFormWizard.java index 4d730225d..d0994cf11 100644 --- a/wizards/com/sun/star/wizards/form/CallFormWizard.java +++ b/wizards/com/sun/star/wizards/form/CallFormWizard.java @@ -31,9 +31,7 @@ import com.sun.star.uno.Type; import com.sun.star.wizards.common.Properties; /** This class capsulates the class, that implements the minimal component, a - * factory for creating the service (<CODE>__getServiceFactory</CODE>) and a - * method, that writes the information into the given registry key - * (<CODE>__writeRegistryServiceInfo</CODE>). + * factory for creating the service (<CODE>__getServiceFactory</CODE>). * @author Bertram Nolte */ public class CallFormWizard @@ -62,19 +60,6 @@ public class CallFormWizard return xsingleservicefactory; } - /** Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code>. - * @return returns true if the operation succeeded - * @see com.sun.star.comp.loader.JavaLoader# - * @param xregistrykey Makes structural information (except regarding tree - * structures) of a single - * registry key accessible. - */ - public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey) - { - return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(FormWizardImplementation.class.getName(), FormWizardImplementation.__serviceName, xregistrykey); - } - /** This class implements the component. At least the interfaces XServiceInfo, * XTypeProvider, and XInitialization should be provided by the service. */ diff --git a/wizards/com/sun/star/wizards/form/DataEntrySetter.java b/wizards/com/sun/star/wizards/form/DataEntrySetter.java index 07649cacc..ee5da12de 100644 --- a/wizards/com/sun/star/wizards/form/DataEntrySetter.java +++ b/wizards/com/sun/star/wizards/form/DataEntrySetter.java @@ -65,7 +65,7 @@ public class DataEntrySetter }, new Object[] { - UIConsts.INTEGERS[8], "HID:34461", sNewDataOnly, new Integer(98), new Integer(25), IDataStep, new Short(curtabindex++), new Integer(195) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTNEWDATAONLY", sNewDataOnly, new Integer(98), new Integer(25), IDataStep, new Short(curtabindex++), new Integer(195) }); optDisplayAllData = CurUnoDialog.insertRadioButton("optDisplayAllData", "toggleCheckBoxes", this, @@ -75,7 +75,7 @@ public class DataEntrySetter }, new Object[] { - UIConsts.INTEGERS[8], "HID:34462", sDisplayAllData, new Integer(98), new Integer(50), new Short((short) 1), IDataStep, new Short(curtabindex++), new Integer(197) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTDISPLAYALLDATA", sDisplayAllData, new Integer(98), new Integer(50), new Short((short) 1), IDataStep, new Short(curtabindex++), new Integer(197) }); chknomodification = CurUnoDialog.insertCheckBox("chknomodification", null, new String[] @@ -84,7 +84,7 @@ public class DataEntrySetter }, new Object[] { - UIConsts.INTEGERS[8], "HID:34463", sNoModification, new Integer(108), new Integer(62), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(189) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKNOMODIFICATION", sNoModification, new Integer(108), new Integer(62), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(189) }); chknodeletion = CurUnoDialog.insertCheckBox("chknodeletion", null, new String[] @@ -93,7 +93,7 @@ public class DataEntrySetter }, new Object[] { - UIConsts.INTEGERS[8], "HID:34464", sNoDeletion, new Integer(108), new Integer(74), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(189) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKNODELETION", sNoDeletion, new Integer(108), new Integer(74), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(189) }); chknoaddition = CurUnoDialog.insertCheckBox("chknoaddition", null, new String[] @@ -102,7 +102,7 @@ public class DataEntrySetter }, new Object[] { - UIConsts.INTEGERS[8], "HID:34465", sNoAddition, new Integer(108), new Integer(86), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(191) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKNOADDITION", sNoAddition, new Integer(108), new Integer(86), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(191) }); CurUnoDialog.insertLabel("lbldontdisplayExistingData", new String[] diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java index 3396f9433..b9fdfcc38 100644 --- a/wizards/com/sun/star/wizards/form/FieldLinker.java +++ b/wizards/com/sun/star/wizards/form/FieldLinker.java @@ -32,6 +32,7 @@ import com.sun.star.awt.XFixedText; import com.sun.star.awt.XListBox; import com.sun.star.uno.Exception; import com.sun.star.wizards.common.Helper; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.common.JavaTools; import com.sun.star.wizards.db.RelationController; import com.sun.star.wizards.ui.UnoDialog; @@ -86,8 +87,8 @@ public class FieldLinker extends DBLimitedFieldSelection SOFIRSTLINKLST, SOSECLINKLST, SOTHIRDLINKLST, SOFOURTHLINKLST }; } - sSlaveHidString = "HID:" + Integer.toString(FirstHelpIndex + (i * 2)); - sMasterHidString = "HID:" + Integer.toString(FirstHelpIndex + (i * 2) + 1); + sSlaveHidString = HelpIds.getHelpIdString(FirstHelpIndex + (i * 2)); + sMasterHidString = HelpIds.getHelpIdString(FirstHelpIndex + (i * 2) + 1); boolean bDoEnable = (i < 2); lblSlaveFields[i] = CurUnoDialog.insertLabel("lblSlaveFieldLink" + new Integer(i + 1).toString(), new String[] diff --git a/wizards/com/sun/star/wizards/form/Finalizer.java b/wizards/com/sun/star/wizards/form/Finalizer.java index f1d4ce983..31397e5ef 100644 --- a/wizards/com/sun/star/wizards/form/Finalizer.java +++ b/wizards/com/sun/star/wizards/form/Finalizer.java @@ -72,7 +72,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGER_12, "HID:34481", new Integer(97), new Integer(35), UIConsts.INTEGERS[8], new Short((short) 82), "", new Integer(185) + UIConsts.INTEGER_12, "HID:WIZARDS_HID_DLGFORM_TXTPATH", new Integer(97), new Integer(35), UIConsts.INTEGERS[8], new Short((short) 82), "", new Integer(185) }); CurUnoDialog.insertLabel("lblProceed", new String[] @@ -90,7 +90,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], "HID:34482", sWorkWithForm, new Integer(101), new Integer(77), new Short((short) 1), UIConsts.INTEGERS[8], new Short(curtabindex++), new Integer(107) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTWORKWITHFORM", sWorkWithForm, new Integer(101), new Integer(77), new Short((short) 1), UIConsts.INTEGERS[8], new Short(curtabindex++), new Integer(107) }); optModifyForm = CurUnoDialog.insertRadioButton("optModifyForm", null, new String[] @@ -99,7 +99,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], "HID:34483", sModifyForm, new Integer(101), new Integer(89), UIConsts.INTEGERS[8], new Short(curtabindex++), new Integer(107) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTMODIFYFORM", sModifyForm, new Integer(101), new Integer(89), UIConsts.INTEGERS[8], new Short(curtabindex++), new Integer(107) }); } diff --git a/wizards/com/sun/star/wizards/form/FormConfiguration.java b/wizards/com/sun/star/wizards/form/FormConfiguration.java index 0c293a850..328fb453b 100644 --- a/wizards/com/sun/star/wizards/form/FormConfiguration.java +++ b/wizards/com/sun/star/wizards/form/FormConfiguration.java @@ -82,7 +82,7 @@ public class FormConfiguration }, new Object[] { - UIConsts.INTEGERS[8], "HID:34421", sSelectManually, new Integer(97), new Integer(26), ISubFormStep, new Short(curtabindex++), new Integer(160) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKCREATESUBFORM", sSelectManually, new Integer(97), new Integer(26), ISubFormStep, new Short(curtabindex++), new Integer(160) }); optOnExistingRelation = CurUnoDialog.insertRadioButton("optOnExistingRelation", STOGGLESTEPS, this, new String[] @@ -91,7 +91,7 @@ public class FormConfiguration }, new Object[] { - Boolean.FALSE, UIConsts.INTEGERS[8], "HID:34422", sOnExistingRelation, new Integer(107), new Integer(43), ISubFormStep, new Short(curtabindex++), new Integer(160) + Boolean.FALSE, UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTONEXISTINGRELATION", sOnExistingRelation, new Integer(107), new Integer(43), ISubFormStep, new Short(curtabindex++), new Integer(160) }); optSelectManually = CurUnoDialog.insertRadioButton("optSelectManually", STOGGLESTEPS, this, new String[] @@ -100,7 +100,7 @@ public class FormConfiguration }, new Object[] { - Boolean.FALSE, UIConsts.INTEGERS[8], "HID:34423", sOnManualRelation, new Integer(107), new Integer(99), new Short((short) 1), ISubFormStep, new Short(curtabindex++), new Integer(160) + Boolean.FALSE, UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTSELECTMANUALLY", sOnManualRelation, new Integer(107), new Integer(99), new Short((short) 1), ISubFormStep, new Short(curtabindex++), new Integer(160) }); lblRelations = CurUnoDialog.insertLabel("lblSelectRelation", new String[] @@ -118,7 +118,7 @@ public class FormConfiguration }, new Object[] { - Boolean.FALSE, new Integer(37), "HID:34424", new Integer(201), new Integer(55), ISubFormStep, new Short(curtabindex++), new Integer(103) + Boolean.FALSE, new Integer(37), "HID:WIZARDS_HID_DLGFORM_lstRELATIONS", new Integer(201), new Integer(55), ISubFormStep, new Short(curtabindex++), new Integer(103) }); lblSubFormDescription = CurUnoDialog.insertLabel("lblSubFormDescription", new String[] diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java index 09a9f1aad..ed2064594 100644 --- a/wizards/com/sun/star/wizards/form/StyleApplier.java +++ b/wizards/com/sun/star/wizards/form/StyleApplier.java @@ -125,7 +125,7 @@ public class StyleApplier }, new Object[] { - new Integer(143), "HID:34471", new Integer(92), new Integer(35), SelLayoutPos, IStyleStep, this.StyleNames, new Short(curtabindex++), new Integer(90) + new Integer(143), "HID:WIZARDS_HID_DLGFORM_LSTSTYLES", new Integer(92), new Integer(35), SelLayoutPos, IStyleStep, this.StyleNames, new Short(curtabindex++), new Integer(90) }); optNoBorder = CurUnoDialog.insertRadioButton("otpNoBorder", SCHANGEBORDERTYPE, this, @@ -135,7 +135,7 @@ public class StyleApplier }, new Object[] { - UIConsts.INTEGERS[10], "HID:34472", sNoBorder, new Integer(196), new Integer(39), IStyleStep, new Short(curtabindex++), "0", new Integer(93) + UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDNOBORDER", sNoBorder, new Integer(196), new Integer(39), IStyleStep, new Short(curtabindex++), "0", new Integer(93) }); opt3DLook = CurUnoDialog.insertRadioButton("otp3DLook", SCHANGEBORDERTYPE, this, @@ -145,7 +145,7 @@ public class StyleApplier }, new Object[] { - UIConsts.INTEGERS[10], "HID:34473", s3DLook, new Integer(196), new Integer(53), new Short((short) 1), IStyleStep, new Short(curtabindex++), "1", new Integer(93) + UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMD3DBORDER", s3DLook, new Integer(196), new Integer(53), new Short((short) 1), IStyleStep, new Short(curtabindex++), "1", new Integer(93) }); optFlat = CurUnoDialog.insertRadioButton("otpFlat", SCHANGEBORDERTYPE, this, @@ -155,7 +155,7 @@ public class StyleApplier }, new Object[] { - UIConsts.INTEGERS[10], "HID:34474", sFlat, new Integer(196), new Integer(67), IStyleStep, new Short(curtabindex++), "2", new Integer(93) + UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER", sFlat, new Integer(196), new Integer(67), IStyleStep, new Short(curtabindex++), "2", new Integer(93) }); CurUnoDialog.insertFixedLine("lnFieldBorder", diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java index 61d634a11..c90acc93c 100644 --- a/wizards/com/sun/star/wizards/form/UIControlArranger.java +++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java @@ -92,7 +92,7 @@ public class UIControlArranger }, new Object[] { - UIConsts.INTEGERS[10], "HID:34451", sAlignLeft, new Integer(107), new Integer(38), new Short((short) 1), IControlStep, new Short(curtabindex++), new Integer(171) + UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDALIGNLEFT", sAlignLeft, new Integer(107), new Integer(38), new Short((short) 1), IControlStep, new Short(curtabindex++), new Integer(171) }); // Radio Button "Align Right" optAlignRight = CurUnoDialog.insertRadioButton("optAlignRight", SOALIGNMETHOD, this, @@ -102,7 +102,7 @@ public class UIControlArranger }, new Object[] { - UIConsts.INTEGERS[10], "HID:34452", sAlignRight, Boolean.TRUE, new Integer(107), new Integer(50), IControlStep, new Short(curtabindex++), new Integer(171) + UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDALIGNRIGHT", sAlignRight, Boolean.TRUE, new Integer(107), new Integer(50), IControlStep, new Short(curtabindex++), new Integer(171) }); @@ -142,7 +142,7 @@ public class UIControlArranger // { // Boolean.valueOf(bEnabled), // new Integer(14), -///* TODO: WRONG!*/ "HID:34452", +///* TODO: WRONG!*/ "HID:WIZARDS_HID_DLGFORM_CMDALIGNRIGHT", // "1", // new Integer(nXPos + nBtnWidth), // new Integer(nYPos), diff --git a/wizards/com/sun/star/wizards/form/form.component b/wizards/com/sun/star/wizards/form/form.component new file mode 100644 index 000000000..3f010d8bc --- /dev/null +++ b/wizards/com/sun/star/wizards/form/form.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Java2" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation + name="com.sun.star.wizards.form.CallFormWizard$FormWizardImplementation"> + <service name="com.sun.star.wizards.form.CallFormWizard"/> + </implementation> +</component> diff --git a/wizards/com/sun/star/wizards/form/makefile.mk b/wizards/com/sun/star/wizards/form/makefile.mk index 092135289..b63666073 100644 --- a/wizards/com/sun/star/wizards/form/makefile.mk +++ b/wizards/com/sun/star/wizards/form/makefile.mk @@ -65,3 +65,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/form.component + +$(MISC)/form.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + form.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt form.component diff --git a/wizards/com/sun/star/wizards/letter/CallWizard.java b/wizards/com/sun/star/wizards/letter/CallWizard.java index d203856d6..5488ffcc4 100644 --- a/wizards/com/sun/star/wizards/letter/CallWizard.java +++ b/wizards/com/sun/star/wizards/letter/CallWizard.java @@ -41,8 +41,7 @@ import com.sun.star.uno.Type; /** * This class capsulates the class, that implements the minimal component, a factory for - * creating the service (<CODE>__getServiceFactory</CODE>) and a method, that writes the - * information into the given registry key (<CODE>__writeRegistryServiceInfo</CODE>). + * creating the service (<CODE>__getServiceFactory</CODE>). * * @author $author$ * @version $Revision: 1.3.192.1 $ @@ -78,22 +77,6 @@ public class CallWizard } /** - * Writes the service information into the given registry key. This method is called - * by the <code>JavaLoader</code>. - * - * @param xregistrykey Makes structural information (except regarding tree - * structures) of a single registry key accessible. - * - * @return returns true if the operation succeeded - * - * @see com.sun.star.comp.loader.JavaLoader# - */ - public static boolean __writeRegistryServiceInfo(XRegistryKey xregistrykey) - { - return FactoryHelper.writeRegistryServiceInfo(WizardImplementation.class.getName(), WizardImplementation.__serviceName, xregistrykey); - } - - /** * This class implements the component. At least the interfaces XServiceInfo, * XTypeProvider, and XInitialization should be provided by the service. */ diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.java index 03638d368..e0ef661e5 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.java +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.java @@ -169,7 +169,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 1), resources.resoptBusinessLetter_value, "optBusinessLetter", new Integer(97), new Integer(28), INTEGERS[1], new Short((short) 1), new Integer(184) + INTEGERS[8], HelpIds.getHelpIdString(HID + 1), resources.resoptBusinessLetter_value, "optBusinessLetter", new Integer(97), new Integer(28), INTEGERS[1], new Short((short) 1), new Integer(184) }); optPrivOfficialLetter = insertRadioButton("optPrivOfficialLetter", OPTPRIVOFFICIALLETTER_ITEM_CHANGED, new String[] @@ -178,7 +178,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 2), resources.resoptPrivOfficialLetter_value, "optPrivOfficialLetter", new Integer(97), new Integer(74), INTEGERS[1], new Short((short) 2), new Integer(184) + INTEGERS[8], HelpIds.getHelpIdString(HID + 2), resources.resoptPrivOfficialLetter_value, "optPrivOfficialLetter", new Integer(97), new Integer(74), INTEGERS[1], new Short((short) 2), new Integer(184) }); optPrivateLetter = insertRadioButton("optPrivateLetter", OPTPRIVATELETTER_ITEM_CHANGED, new String[] @@ -187,7 +187,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 3), resources.resoptPrivateLetter_value, "optPrivateLetter", new Integer(97), new Integer(106), INTEGERS[1], new Short((short) 3), new Integer(184) + INTEGERS[8], HelpIds.getHelpIdString(HID + 3), resources.resoptPrivateLetter_value, "optPrivateLetter", new Integer(97), new Integer(106), INTEGERS[1], new Short((short) 3), new Integer(184) }); lstBusinessStyle = insertListBox("lstBusinessStyle", LSTBUSINESSSTYLE_ACTION_PERFORMED, LSTBUSINESSSTYLE_ITEM_CHANGED, new String[] @@ -196,7 +196,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + (HID + 4), "lstBusinessStyle", new Integer(180), INTEGER_40, INTEGERS[1], new Short((short) 4), new Integer(74) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 4), "lstBusinessStyle", new Integer(180), INTEGER_40, INTEGERS[1], new Short((short) 4), new Integer(74) }); chkBusinessPaper = insertCheckBox("chkBusinessPaper", CHKBUSINESSPAPER_ITEM_CHANGED, new String[] @@ -205,7 +205,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 5), resources.reschkBusinessPaper_value, "chkBusinessPaper", new Integer(110), new Integer(56), new Short((short) 0), INTEGERS[1], new Short((short) 5), new Integer(168) + INTEGERS[8], HelpIds.getHelpIdString(HID + 5), resources.reschkBusinessPaper_value, "chkBusinessPaper", new Integer(110), new Integer(56), new Short((short) 0), INTEGERS[1], new Short((short) 5), new Integer(168) }); lstPrivOfficialStyle = insertListBox("lstPrivOfficialStyle", LSTPRIVOFFICIALSTYLE_ACTION_PERFORMED, LSTPRIVOFFICIALSTYLE_ITEM_CHANGED, new String[] @@ -214,7 +214,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + (HID + 6), "lstPrivOfficialStyle", new Integer(180), new Integer(86), INTEGERS[1], new Short((short) 6), new Integer(74) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 6), "lstPrivOfficialStyle", new Integer(180), new Integer(86), INTEGERS[1], new Short((short) 6), new Integer(74) }); lstPrivateStyle = insertListBox("lstPrivateStyle", LSTPRIVATESTYLE_ACTION_PERFORMED, LSTPRIVATESTYLE_ITEM_CHANGED, new String[] @@ -223,7 +223,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + (HID + 7), "lstPrivateStyle", new Integer(180), new Integer(118), INTEGERS[1], new Short((short) 7), new Integer(74) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 7), "lstPrivateStyle", new Integer(180), new Integer(118), INTEGERS[1], new Short((short) 7), new Integer(74) }); lblBusinessStyle = insertLabel("lblBusinessStyle", new String[] @@ -287,7 +287,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 8), resources.reschkPaperCompanyLogo_value, "chkPaperCompanyLogo", new Integer(97), new Integer(28), new Short((short) 0), INTEGERS[2], new Short((short) 8), new Integer(68) + INTEGERS[8], HelpIds.getHelpIdString(HID + 8), resources.reschkPaperCompanyLogo_value, "chkPaperCompanyLogo", new Integer(97), new Integer(28), new Short((short) 0), INTEGERS[2], new Short((short) 8), new Integer(68) }); numLogoHeight = insertNumericField("numLogoHeight", NUMLOGOHEIGHT_TEXT_CHANGED, new String[] @@ -296,7 +296,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 9), "numLogoHeight", new Integer(138), INTEGER_40, Boolean.TRUE, INTEGERS[2], Boolean.TRUE, new Short((short) 9), INTEGERS[3], new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 9), "numLogoHeight", new Integer(138), INTEGER_40, Boolean.TRUE, INTEGERS[2], Boolean.TRUE, new Short((short) 9), INTEGERS[3], new Integer(30) }); numLogoX = insertNumericField("numLogoX", NUMLOGOX_TEXT_CHANGED, new String[] @@ -305,7 +305,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 10), "numLogoX", new Integer(266), INTEGER_40, Boolean.TRUE, INTEGERS[2], new Short((short) 10), INTEGERS[0], new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 10), "numLogoX", new Integer(266), INTEGER_40, Boolean.TRUE, INTEGERS[2], new Short((short) 10), INTEGERS[0], new Integer(30) }); numLogoWidth = insertNumericField("numLogoWidth", NUMLOGOWIDTH_TEXT_CHANGED, new String[] @@ -314,7 +314,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 11), "numLogoWidth", new Integer(138), new Integer(56), Boolean.TRUE, INTEGERS[2], new Short((short) 11), new Double(3.8), new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 11), "numLogoWidth", new Integer(138), new Integer(56), Boolean.TRUE, INTEGERS[2], new Short((short) 11), new Double(3.8), new Integer(30) }); numLogoY = insertNumericField("numLogoY", NUMLOGOY_TEXT_CHANGED, new String[] @@ -323,7 +323,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 12), "numLogoY", new Integer(266), new Integer(56), Boolean.TRUE, INTEGERS[2], new Short((short) 12), new Double(-3.4), new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 12), "numLogoY", new Integer(266), new Integer(56), Boolean.TRUE, INTEGERS[2], new Short((short) 12), new Double(-3.4), new Integer(30) }); chkPaperCompanyAddress = insertCheckBox("chkPaperCompanyAddress", CHKPAPERCOMPANYADDRESS_ITEM_CHANGED, new String[] @@ -332,7 +332,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 13), resources.reschkPaperCompanyAddress_value, "chkPaperCompanyAddress", new Integer(98), new Integer(84), new Short((short) 0), INTEGERS[2], new Short((short) 13), new Integer(68) + INTEGERS[8], HelpIds.getHelpIdString(HID + 13), resources.reschkPaperCompanyAddress_value, "chkPaperCompanyAddress", new Integer(98), new Integer(84), new Short((short) 0), INTEGERS[2], new Short((short) 13), new Integer(68) }); numAddressHeight = insertNumericField("numAddressHeight", NUMADDRESSHEIGHT_TEXT_CHANGED, new String[] @@ -341,7 +341,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 14), "numAddressHeight", new Integer(138), new Integer(96), Boolean.TRUE, INTEGERS[2], Boolean.TRUE, new Short((short) 14), INTEGERS[3], new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 14), "numAddressHeight", new Integer(138), new Integer(96), Boolean.TRUE, INTEGERS[2], Boolean.TRUE, new Short((short) 14), INTEGERS[3], new Integer(30) }); numAddressX = insertNumericField("numAddressX", NUMADDRESSX_TEXT_CHANGED, new String[] @@ -350,7 +350,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 15), "numAddressX", new Integer(266), new Integer(96), Boolean.TRUE, INTEGERS[2], new Short((short) 15), new Double(3.8), new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 15), "numAddressX", new Integer(266), new Integer(96), Boolean.TRUE, INTEGERS[2], new Short((short) 15), new Double(3.8), new Integer(30) }); numAddressWidth = insertNumericField("numAddressWidth", NUMADDRESSWIDTH_TEXT_CHANGED, new String[] @@ -359,7 +359,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 16), "numAddressWidth", new Integer(138), new Integer(112), Boolean.TRUE, INTEGERS[2], new Short((short) 16), new Double(13.8), new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 16), "numAddressWidth", new Integer(138), new Integer(112), Boolean.TRUE, INTEGERS[2], new Short((short) 16), new Double(13.8), new Integer(30) }); numAddressY = insertNumericField("numAddressY", NUMADDRESSY_TEXT_CHANGED, new String[] @@ -368,7 +368,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 17), "numAddressY", new Integer(266), new Integer(112), Boolean.TRUE, INTEGERS[2], new Short((short) 17), new Double(-3.4), new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 17), "numAddressY", new Integer(266), new Integer(112), Boolean.TRUE, INTEGERS[2], new Short((short) 17), new Double(-3.4), new Integer(30) }); chkCompanyReceiver = insertCheckBox("chkCompanyReceiver", CHKCOMPANYRECEIVER_ITEM_CHANGED, new String[] @@ -377,7 +377,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 18), resources.reschkCompanyReceiver_value, "chkCompanyReceiver", new Integer(103), new Integer(131), new Short((short) 0), INTEGERS[2], new Short((short) 18), new Integer(185) + INTEGERS[8], HelpIds.getHelpIdString(HID + 18), resources.reschkCompanyReceiver_value, "chkCompanyReceiver", new Integer(103), new Integer(131), new Short((short) 0), INTEGERS[2], new Short((short) 18), new Integer(185) }); chkPaperFooter = insertCheckBox("chkPaperFooter", CHKPAPERFOOTER_ITEM_CHANGED, new String[] @@ -386,7 +386,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 19), resources.reschkPaperFooter_value, "chkPaperFooter", new Integer(97), new Integer(158), new Short((short) 0), INTEGERS[2], new Short((short) 19), new Integer(68) + INTEGERS[8], HelpIds.getHelpIdString(HID + 19), resources.reschkPaperFooter_value, "chkPaperFooter", new Integer(97), new Integer(158), new Short((short) 0), INTEGERS[2], new Short((short) 19), new Integer(68) }); numFooterHeight = insertNumericField("numFooterHeight", NUMFOOTERHEIGHT_TEXT_CHANGED, new String[] @@ -395,7 +395,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 20), "numFooterHeight", new Integer(236), new Integer(156), Boolean.TRUE, INTEGERS[2], new Short((short) 20), INTEGERS[5], new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 20), "numFooterHeight", new Integer(236), new Integer(156), Boolean.TRUE, INTEGERS[2], new Short((short) 20), INTEGERS[5], new Integer(30) }); lblLogoHeight = insertLabel("lblLogoHeight", new String[] @@ -516,7 +516,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + (HID + 21), "lstLetterNorm", new Integer(210), new Integer(34), INTEGERS[3], new Short((short) 21), new Integer(74) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 21), "lstLetterNorm", new Integer(210), new Integer(34), INTEGERS[3], new Short((short) 21), new Integer(74) }); chkUseLogo = insertCheckBox("chkUseLogo", CHKUSELOGO_ITEM_CHANGED, new String[] @@ -525,7 +525,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 22), resources.reschkUseLogo_value, "chkUseLogo", new Integer(97), new Integer(54), new Short((short) 0), INTEGERS[3], new Short((short) 22), new Integer(212) + INTEGERS[8], HelpIds.getHelpIdString(HID + 22), resources.reschkUseLogo_value, "chkUseLogo", new Integer(97), new Integer(54), new Short((short) 0), INTEGERS[3], new Short((short) 22), new Integer(212) }); chkUseAddressReceiver = insertCheckBox("chkUseAddressReceiver", CHKUSEADDRESSRECEIVER_ITEM_CHANGED, new String[] @@ -534,7 +534,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 23), resources.reschkUseAddressReceiver_value, "chkUseAddressReceiver", new Integer(97), new Integer(69), new Short((short) 0), INTEGERS[3], new Short((short) 23), new Integer(212) + INTEGERS[8], HelpIds.getHelpIdString(HID + 23), resources.reschkUseAddressReceiver_value, "chkUseAddressReceiver", new Integer(97), new Integer(69), new Short((short) 0), INTEGERS[3], new Short((short) 23), new Integer(212) }); chkUseSigns = insertCheckBox("chkUseSigns", CHKUSESIGNS_ITEM_CHANGED, new String[] @@ -543,7 +543,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 24), resources.reschkUseSigns_value, "chkUseSigns", new Integer(97), new Integer(82), new Short((short) 0), INTEGERS[3], new Short((short) 24), new Integer(212) + INTEGERS[8], HelpIds.getHelpIdString(HID + 24), resources.reschkUseSigns_value, "chkUseSigns", new Integer(97), new Integer(82), new Short((short) 0), INTEGERS[3], new Short((short) 24), new Integer(212) }); chkUseSubject = insertCheckBox("chkUseSubject", CHKUSESUBJECT_ITEM_CHANGED, new String[] @@ -552,7 +552,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 25), resources.reschkUseSubject_value, "chkUseSubject", new Integer(97), new Integer(98), new Short((short) 0), INTEGERS[3], new Short((short) 25), new Integer(212) + INTEGERS[8], HelpIds.getHelpIdString(HID + 25), resources.reschkUseSubject_value, "chkUseSubject", new Integer(97), new Integer(98), new Short((short) 0), INTEGERS[3], new Short((short) 25), new Integer(212) }); chkUseSalutation = insertCheckBox("chkUseSalutation", CHKUSESALUTATION_ITEM_CHANGED, new String[] @@ -561,7 +561,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 26), resources.reschkUseSalutation_value, "chkUseSalutation", new Integer(97), new Integer(113), new Short((short) 0), INTEGERS[3], new Short((short) 26), new Integer(66) + INTEGERS[8], HelpIds.getHelpIdString(HID + 26), resources.reschkUseSalutation_value, "chkUseSalutation", new Integer(97), new Integer(113), new Short((short) 0), INTEGERS[3], new Short((short) 26), new Integer(66) }); lstSalutation = insertComboBox("lstSalutation", LSTSALUTATION_ACTION_PERFORMED, LSTSALUTATION_ITEM_CHANGED, LSTSALUTATION_TEXT_CHANGED, new String[] @@ -570,7 +570,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + (HID + 27), "lstSalutation", new Integer(210), new Integer(110), INTEGERS[3], new Short((short) 27), new Integer(74) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 27), "lstSalutation", new Integer(210), new Integer(110), INTEGERS[3], new Short((short) 27), new Integer(74) }); chkUseBendMarks = insertCheckBox("chkUseBendMarks", CHKUSEBENDMARKS_ITEM_CHANGED, new String[] @@ -579,7 +579,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 28), resources.reschkUseBendMarks_value, "chkUseBendMarks", new Integer(97), new Integer(127), new Short((short) 0), INTEGERS[3], new Short((short) 28), new Integer(212) + INTEGERS[8], HelpIds.getHelpIdString(HID + 28), resources.reschkUseBendMarks_value, "chkUseBendMarks", new Integer(97), new Integer(127), new Short((short) 0), INTEGERS[3], new Short((short) 28), new Integer(212) }); chkUseGreeting = insertCheckBox("chkUseGreeting", CHKUSEGREETING_ITEM_CHANGED, new String[] @@ -588,7 +588,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 29), resources.reschkUseGreeting_value, "chkUseGreeting", new Integer(97), new Integer(142), new Short((short) 0), INTEGERS[3], new Short((short) 29), new Integer(66) + INTEGERS[8], HelpIds.getHelpIdString(HID + 29), resources.reschkUseGreeting_value, "chkUseGreeting", new Integer(97), new Integer(142), new Short((short) 0), INTEGERS[3], new Short((short) 29), new Integer(66) }); lstGreeting = insertComboBox("lstGreeting", LSTGREETING_ACTION_PERFORMED, LSTGREETING_ITEM_CHANGED, LSTGREETING_TEXT_CHANGED, new String[] @@ -597,7 +597,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + (HID + 30), "lstGreeting", new Integer(210), new Integer(141), INTEGERS[3], new Short((short) 30), new Integer(74) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 30), "lstGreeting", new Integer(210), new Integer(141), INTEGERS[3], new Short((short) 30), new Integer(74) }); chkUseFooter = insertCheckBox("chkUseFooter", CHKUSEFOOTER_ITEM_CHANGED, new String[] @@ -606,7 +606,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 31), resources.reschkUseFooter_value, "chkUseFooter", new Integer(97), new Integer(158), new Short((short) 0), INTEGERS[3], new Short((short) 31), new Integer(212) + INTEGERS[8], HelpIds.getHelpIdString(HID + 31), resources.reschkUseFooter_value, "chkUseFooter", new Integer(97), new Integer(158), new Short((short) 0), INTEGERS[3], new Short((short) 31), new Integer(212) }); lblLetterNorm = insertLabel("lblLetterNorm", new String[] @@ -637,7 +637,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 32), resources.resoptSenderPlaceholder_value, "optSenderPlaceholder", new Integer(104), new Integer(42), INTEGERS[4], new Short((short) 32), new Integer(149) + INTEGERS[8], HelpIds.getHelpIdString(HID + 32), resources.resoptSenderPlaceholder_value, "optSenderPlaceholder", new Integer(104), new Integer(42), INTEGERS[4], new Short((short) 32), new Integer(149) }); optSenderDefine = insertRadioButton("optSenderDefine", OPTSENDERDEFINE_ITEM_CHANGED, new String[] @@ -646,7 +646,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 33), resources.resoptSenderDefine_value, "optSenderDefine", new Integer(104), new Integer(54), INTEGERS[4], new Short((short) 33), new Integer(149) + INTEGERS[8], HelpIds.getHelpIdString(HID + 33), resources.resoptSenderDefine_value, "optSenderDefine", new Integer(104), new Integer(54), INTEGERS[4], new Short((short) 33), new Integer(149) }); txtSenderName = insertTextField("txtSenderName", TXTSENDERNAME_TEXT_CHANGED, new String[] @@ -655,7 +655,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 34), "txtSenderName", new Integer(182), new Integer(67), INTEGERS[4], new Short((short) 34), new Integer(119) + INTEGER_12, HelpIds.getHelpIdString(HID + 34), "txtSenderName", new Integer(182), new Integer(67), INTEGERS[4], new Short((short) 34), new Integer(119) }); txtSenderStreet = insertTextField("txtSenderStreet", TXTSENDERSTREET_TEXT_CHANGED, new String[] @@ -664,7 +664,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 35), "txtSenderStreet", new Integer(182), new Integer(81), INTEGERS[4], new Short((short) 35), new Integer(119) + INTEGER_12, HelpIds.getHelpIdString(HID + 35), "txtSenderStreet", new Integer(182), new Integer(81), INTEGERS[4], new Short((short) 35), new Integer(119) }); txtSenderPostCode = insertTextField("txtSenderPostCode", TXTSENDERPOSTCODE_TEXT_CHANGED, new String[] @@ -673,7 +673,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 36), "txtSenderPostCode", new Integer(182), new Integer(95), INTEGERS[4], new Short((short) 36), new Integer(25) + INTEGER_12, HelpIds.getHelpIdString(HID + 36), "txtSenderPostCode", new Integer(182), new Integer(95), INTEGERS[4], new Short((short) 36), new Integer(25) }); txtSenderState = insertTextField("txtSenderState", TXTSENDERSTATE_TEXT_CHANGED, new String[] @@ -682,7 +682,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 37), "txtSenderState", new Integer(211), new Integer(95), INTEGERS[4], new Short((short) 37), new Integer(21) + INTEGER_12, HelpIds.getHelpIdString(HID + 37), "txtSenderState", new Integer(211), new Integer(95), INTEGERS[4], new Short((short) 37), new Integer(21) }); txtSenderCity = insertTextField("txtSenderCity", TXTSENDERCITY_TEXT_CHANGED, new String[] @@ -691,7 +691,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 38), "txtSenderCity", new Integer(236), new Integer(95), INTEGERS[4], new Short((short) 38), new Integer(65) + INTEGER_12, HelpIds.getHelpIdString(HID + 38), "txtSenderCity", new Integer(236), new Integer(95), INTEGERS[4], new Short((short) 38), new Integer(65) }); optReceiverPlaceholder = insertRadioButton("optReceiverPlaceholder", OPTRECEIVERPLACEHOLDER_ITEM_CHANGED, new String[] @@ -700,7 +700,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 39), resources.resoptReceiverPlaceholder_value, "optReceiverPlaceholder", new Integer(104), new Integer(145), INTEGERS[4], new Short((short) 39), new Integer(200) + INTEGERS[8], HelpIds.getHelpIdString(HID + 39), resources.resoptReceiverPlaceholder_value, "optReceiverPlaceholder", new Integer(104), new Integer(145), INTEGERS[4], new Short((short) 39), new Integer(200) }); optReceiverDatabase = insertRadioButton("optReceiverDatabase", OPTRECEIVERDATABASE_ITEM_CHANGED, new String[] @@ -709,7 +709,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 40), resources.resoptReceiverDatabase_value, "optReceiverDatabase", new Integer(104), new Integer(157), INTEGERS[4], new Short((short) 40), new Integer(200) + INTEGERS[8], HelpIds.getHelpIdString(HID + 40), resources.resoptReceiverDatabase_value, "optReceiverDatabase", new Integer(104), new Integer(157), INTEGERS[4], new Short((short) 40), new Integer(200) }); lblSenderAddress = insertLabel("lblSenderAddress", new String[] @@ -785,7 +785,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - new Integer(47), "HID:" + (HID + 41), Boolean.TRUE, "txtFooter", new Integer(97), INTEGER_40, INTEGERS[5], new Short((short) 41), new Integer(203) + new Integer(47), HelpIds.getHelpIdString(HID + 41), Boolean.TRUE, "txtFooter", new Integer(97), INTEGER_40, INTEGERS[5], new Short((short) 41), new Integer(203) }); chkFooterNextPages = insertCheckBox("chkFooterNextPages", CHKFOOTERNEXTPAGES_ITEM_CHANGED, new String[] @@ -794,7 +794,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 42), resources.reschkFooterNextPages_value, "chkFooterNextPages", new Integer(97), new Integer(92), new Short((short) 0), INTEGERS[5], new Short((short) 42), new Integer(202) + INTEGERS[8], HelpIds.getHelpIdString(HID + 42), resources.reschkFooterNextPages_value, "chkFooterNextPages", new Integer(97), new Integer(92), new Short((short) 0), INTEGERS[5], new Short((short) 42), new Integer(202) }); chkFooterPageNumbers = insertCheckBox("chkFooterPageNumbers", CHKFOOTERPAGENUMBERS_ITEM_CHANGED, new String[] @@ -803,7 +803,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 43), resources.reschkFooterPageNumbers_value, "chkFooterPageNumbers", new Integer(97), new Integer(106), new Short((short) 0), INTEGERS[5], new Short((short) 43), new Integer(201) + INTEGERS[8], HelpIds.getHelpIdString(HID + 43), resources.reschkFooterPageNumbers_value, "chkFooterPageNumbers", new Integer(97), new Integer(106), new Short((short) 0), INTEGERS[5], new Short((short) 43), new Integer(201) }); lblFooter = insertLabel("lblFooter", new String[] @@ -834,7 +834,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 44), "txtTemplateName", new Integer(202), new Integer(56), INTEGERS[6], new Short((short) 44), resources.restxtTemplateName_value, new Integer(100) + INTEGER_12, HelpIds.getHelpIdString(HID + 44), "txtTemplateName", new Integer(202), new Integer(56), INTEGERS[6], new Short((short) 44), resources.restxtTemplateName_value, new Integer(100) }); optCreateLetter = insertRadioButton("optCreateLetter", OPTCREATELETTER_ITEM_CHANGED, new String[] @@ -843,7 +843,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 45), resources.resoptCreateLetter_value, "optCreateLetter", new Integer(104), new Integer(111), INTEGERS[6], new Short((short) 50), new Integer(198) + INTEGERS[8], HelpIds.getHelpIdString(HID + 45), resources.resoptCreateLetter_value, "optCreateLetter", new Integer(104), new Integer(111), INTEGERS[6], new Short((short) 50), new Integer(198) }); optMakeChanges = insertRadioButton("optMakeChanges", OPTMAKECHANGES_ITEM_CHANGED, new String[] @@ -852,7 +852,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 46), resources.resoptMakeChanges_value, "optMakeChanges", new Integer(104), new Integer(123), INTEGERS[6], new Short((short) 51), new Integer(198) + INTEGERS[8], HelpIds.getHelpIdString(HID + 46), resources.resoptMakeChanges_value, "optMakeChanges", new Integer(104), new Integer(123), INTEGERS[6], new Short((short) 51), new Integer(198) }); lblFinalExplanation1 = insertLabel("lblFinalExplanation1", new String[] @@ -910,4 +910,4 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }); } -}
\ No newline at end of file +} diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java index e11d33eaa..9a0d47acb 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java @@ -1435,7 +1435,7 @@ public class LetterWizardDialogImpl extends LetterWizardDialog public void insertPathSelectionControl() { myPathSelection = new PathSelection(xMSF, this, PathSelection.TransferMode.SAVE, PathSelection.DialogTypes.FILE); - myPathSelection.insert(6, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, "HID:" + (HID + 47), "HID:" + (HID + 48)); + myPathSelection.insert(6, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, HelpIds.getHelpIdString(HID + 47), HelpIds.getHelpIdString(HID + 48)); myPathSelection.sDefaultDirectory = sUserTemplatePath; myPathSelection.sDefaultName = "myLetterTemplate.ott"; myPathSelection.sDefaultFilter = "writer8_template"; diff --git a/wizards/com/sun/star/wizards/letter/letter.component b/wizards/com/sun/star/wizards/letter/letter.component new file mode 100644 index 000000000..277aae81e --- /dev/null +++ b/wizards/com/sun/star/wizards/letter/letter.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Java2" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation + name="com.sun.star.wizards.letter.CallWizard$WizardImplementation"> + <service name="com.sun.star.wizards.letter.CallWizard"/> + </implementation> +</component> diff --git a/wizards/com/sun/star/wizards/letter/makefile.mk b/wizards/com/sun/star/wizards/letter/makefile.mk index 700d0b72d..ca6c750ba 100644 --- a/wizards/com/sun/star/wizards/letter/makefile.mk +++ b/wizards/com/sun/star/wizards/letter/makefile.mk @@ -63,3 +63,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/letter.component + +$(MISC)/letter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + letter.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt letter.component diff --git a/wizards/com/sun/star/wizards/makefile.mk b/wizards/com/sun/star/wizards/makefile.mk index fb9c3e185..a9ec3e2d5 100644 --- a/wizards/com/sun/star/wizards/makefile.mk +++ b/wizards/com/sun/star/wizards/makefile.mk @@ -55,6 +55,7 @@ JARTARGET = commonwizards.jar # --- Files -------------------------------------------------------- JAVAFILES= \ + common$/HelpIds.java \ common$/Desktop.java \ common$/NumberFormatter.java \ common$/FileAccess.java \ diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java index f108bc365..99952e19c 100644 --- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java +++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java @@ -34,9 +34,7 @@ import com.sun.star.uno.Type; import com.sun.star.wizards.common.Properties; /** This class capsulates the class, that implements the minimal component, a - * factory for creating the service (<CODE>__getServiceFactory</CODE>) and a - * method, that writes the information into the given registry key - * (<CODE>__writeRegistryServiceInfo</CODE>). + * factory for creating the service (<CODE>__getServiceFactory</CODE>). * @author Bertram Nolte */ public class CallQueryWizard @@ -65,19 +63,6 @@ public class CallQueryWizard return xsingleservicefactory; } - /** Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code>. - * @return returns true if the operation succeeded - * @see com.sun.star.comp.loader.JavaLoader# - * @param xregistrykey Makes structural information (except regarding tree - * structures) of a single - * registry key accessible. - */ - public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey) - { - return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(QueryWizardImplementation.class.getName(), QueryWizardImplementation.__serviceName, xregistrykey); - } - /** This class implements the component. At least the interfaces XServiceInfo, * XTypeProvider, and XInitialization should be provided by the service. */ diff --git a/wizards/com/sun/star/wizards/query/Finalizer.java b/wizards/com/sun/star/wizards/query/Finalizer.java index 592c3e64a..ece267433 100644 --- a/wizards/com/sun/star/wizards/query/Finalizer.java +++ b/wizards/com/sun/star/wizards/query/Finalizer.java @@ -78,7 +78,7 @@ public class Finalizer }, new Object[] { - new Integer(12), "HID:" + curHelpIndex++, new Integer(95), new Integer(37), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(90) + new Integer(12), HelpIds.getHelpIdString(curHelpIndex++), new Integer(95), new Integer(37), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(90) }); m_queryWizard.insertLabel("lblHowGoOn", new String[] { @@ -95,7 +95,7 @@ public class Finalizer }, new Object[] { - new Integer(9), "HID:" + curHelpIndex++, resoptDisplayQuery, new Integer(192), new Integer(46), new Short((short) 1), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(118) + new Integer(9), HelpIds.getHelpIdString(curHelpIndex++), resoptDisplayQuery, new Integer(192), new Integer(46), new Short((short) 1), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(118) }); m_queryWizard.insertRadioButton("optModifyQuery", @@ -105,7 +105,7 @@ public class Finalizer }, new Object[] { - new Integer(10), "HID:" + curHelpIndex++, resoptModifyQuery, new Integer(192), new Integer(56), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(118) + new Integer(10), HelpIds.getHelpIdString(curHelpIndex++), resoptModifyQuery, new Integer(192), new Integer(56), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(118) }); m_queryWizard.insertFixedLine("flnSummary", new String[] { @@ -121,7 +121,7 @@ public class Finalizer }, new Object[] { - new Integer(96), "HID:" + curHelpIndex++, Boolean.TRUE, new Integer(95), new Integer(80), Boolean.TRUE, new Integer(8), Boolean.TRUE, new Integer(209) + new Integer(96), HelpIds.getHelpIdString(curHelpIndex++), Boolean.TRUE, new Integer(95), new Integer(80), Boolean.TRUE, new Integer(8), Boolean.TRUE, new Integer(209) }); } diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java index 1ede9b0dd..8184c13c1 100644 --- a/wizards/com/sun/star/wizards/query/QueryWizard.java +++ b/wizards/com/sun/star/wizards/query/QueryWizard.java @@ -36,8 +36,10 @@ import com.sun.star.sdbc.SQLException; import com.sun.star.uno.AnyConverter; import com.sun.star.wizards.ui.UIConsts; import com.sun.star.uno.UnoRuntime; +import com.sun.star.wizards.common.Desktop; import com.sun.star.wizards.common.Helper; import com.sun.star.wizards.common.JavaTools; +import com.sun.star.wizards.common.Properties; import com.sun.star.wizards.common.Resource; import com.sun.star.wizards.db.DatabaseObjectWizard; import com.sun.star.wizards.db.QueryMetaData; @@ -59,15 +61,15 @@ public class QueryWizard extends DatabaseObjectWizard private static final int SOGROUPFILTER_PAGE = 6; private static final int SOTITLES_PAGE = 7; protected static final int SOSUMMARY_PAGE = 8; - private CommandFieldSelection CurDBCommandFieldSelection; - private SortingComponent CurSortingComponent; - private FieldSelection CurGroupFieldSelection; - private TitlesComponent CurTitlesComponent; - private FilterComponent CurFilterComponent; - private FilterComponent CurGroupFilterComponent; - private AggregateComponent CurAggregateComponent; - private Finalizer CurFinalizer; - private QuerySummary CurDBMetaData; + private CommandFieldSelection m_DBCommandFieldSelectio; + private SortingComponent m_sortingComponent; + private FieldSelection m_groupFieldSelection; + private TitlesComponent m_titlesComponent; + private FilterComponent m_filterComponent; + private FilterComponent m_groupFilterComponent; + private AggregateComponent m_aggregateComponent; + private Finalizer m_finalizer; + private QuerySummary m_DBMetaData; private String reslblFieldHeader; private String reslblAliasHeader; private String reslblFields; @@ -82,30 +84,85 @@ public class QueryWizard extends DatabaseObjectWizard { super( xMSF, 40970, i_wizardContext ); addResourceHandler("QueryWizard", "dbw"); - CurDBMetaData = new QuerySummary(xMSF, m_oResource); + m_DBMetaData = new QuerySummary(xMSF, m_oResource); } -/* public static void main(String args[]) + public static void main(String i_args[]) { - String ConnectStr = "uno:pipe,name=foo;urp;StarOffice.ServiceManager"; + final String settings[] = new String[] { null, null, null }; + final int IDX_PIPE_NAME = 0; + final int IDX_LOCATION = 1; + final int IDX_DSN = 2; + + // some simple parsing + boolean failure = false; + int settingsIndex = -1; + for ( int i=0; i<i_args.length; ++i ) + { + if ( settingsIndex >= 0 ) + { + settings[ settingsIndex ] = i_args[i]; + settingsIndex = -1; + continue; + } + + if ( i_args[i].equals( "--pipe-name" ) ) + { + settingsIndex = IDX_PIPE_NAME; + continue; + } + + if ( i_args[i].equals( "--database-location" ) ) + { + settingsIndex = IDX_LOCATION; + continue; + } + + if ( i_args[i].equals( "--data-source-name" ) ) + { + settingsIndex = IDX_DSN; + continue; + } + + failure = true; + } + + if ( settings[ IDX_PIPE_NAME ] == null ) + failure = true; + + if ( ( settings[ IDX_DSN ] == null ) && ( settings[ IDX_LOCATION ] == null ) ) + failure = true; + + if ( failure ) + { + System.err.println( "supported arguments: " ); + System.err.println( " --pipe-name <name> : specifies the name of the pipe to connect to the running OOo instance" ); + System.err.println( " --database-location <url> : specifies the URL of the database document to work with" ); + System.err.println( " --data-source-name <name> : specifies the name of the data source to work with" ); + return; + } + + final String ConnectStr = "uno:pipe,name=" + settings[IDX_PIPE_NAME] + ";urp;StarOffice.ServiceManager"; try { - XMultiServiceFactory xLocMSF = Desktop.connect(ConnectStr); - if (xLocMSF != null) + final XMultiServiceFactory serviceFactory = Desktop.connect(ConnectStr); + if (serviceFactory != null) { PropertyValue[] curproperties = new PropertyValue[1]; - curproperties[0] = Properties.createProperty("DatabaseLocation", "file:///G:/temp/abc.odb"); -// curproperties[0] = Properties.createProperty("DataSourceName", "TESTDB"); + if ( settings[ IDX_LOCATION ] != null ) + curproperties[0] = Properties.createProperty( "DatabaseLocation", settings[ IDX_LOCATION ] ); + else + curproperties[0] = Properties.createProperty( "DataSourceName", settings[ IDX_DSN ] ); - QueryWizard CurQueryWizard = new QueryWizard(xLocMSF); - CurQueryWizard.startQueryWizard(xLocMSF, curproperties); + QueryWizard CurQueryWizard = new QueryWizard( serviceFactory, curproperties ); + CurQueryWizard.startQueryWizard(); } } catch (java.lang.Exception jexception) { jexception.printStackTrace(System.out); } - }*/ + } public final XFrame getFrame() { @@ -116,7 +173,7 @@ public class QueryWizard extends DatabaseObjectWizard { try { - if ( CurDBMetaData.getConnection( m_wizardContext ) ) + if ( m_DBMetaData.getConnection( m_wizardContext ) ) { reslblFields = m_oResource.getResText(UIConsts.RID_QUERY + 4); reslblFieldHeader = m_oResource.getResText(UIConsts.RID_QUERY + 19); //Fielnames in AliasComponent @@ -138,11 +195,11 @@ public class QueryWizard extends DatabaseObjectWizard setRightPaneHeaders(m_oResource, UIConsts.RID_QUERY + 70, 8); this.setMaxStep(8); buildSteps(); - this.CurDBCommandFieldSelection.preselectCommand( m_wizardContext, false ); + this.m_DBCommandFieldSelectio.preselectCommand( m_wizardContext, false ); XWindowPeer windowPeer = UnoRuntime.queryInterface( XWindowPeer.class, m_frame.getContainerWindow() ); createWindowPeer(windowPeer); - CurDBMetaData.setWindowPeer(this.xControl.getPeer()); + m_DBMetaData.setWindowPeer(this.xControl.getPeer()); insertQueryRelatedSteps(); executeDialog( m_frame.getContainerWindow().getPosSize() ); } @@ -151,14 +208,14 @@ public class QueryWizard extends DatabaseObjectWizard { jexception.printStackTrace(System.out); } - CurGroupFilterComponent = null; - CurTitlesComponent = null; - CurAggregateComponent = null; - CurDBCommandFieldSelection = null; + m_groupFilterComponent = null; + m_titlesComponent = null; + m_aggregateComponent = null; + m_DBCommandFieldSelectio = null; xWindowPeer = null; - CurFinalizer = null; - CurDBMetaData.finish(); - CurDBMetaData = null; + m_finalizer = null; + m_DBMetaData.finish(); + m_DBMetaData = null; System.gc(); return m_createdQuery; @@ -181,17 +238,17 @@ public class QueryWizard extends DatabaseObjectWizard case SOAGGREGATE_PAGE: if (_bEnabled == true) { - bEnabled = ((CurDBMetaData.hasNumericalFields()) && (CurDBMetaData.xDBMetaData.supportsCoreSQLGrammar())); + bEnabled = ((m_DBMetaData.hasNumericalFields()) && (m_DBMetaData.xDBMetaData.supportsCoreSQLGrammar())); } break; case SOGROUPSELECTION_PAGE: - bEnabled = CurDBMetaData.Type == QueryMetaData.QueryType.SOSUMMARYQUERY; + bEnabled = m_DBMetaData.Type == QueryMetaData.QueryType.SOSUMMARYQUERY; break; case SOGROUPFILTER_PAGE: bEnabled = false; if (_bEnabled == true) { - bEnabled = (CurDBMetaData.GroupByFilterConditions.length > 0); + bEnabled = (m_DBMetaData.GroupByFilterConditions.length > 0); } break; @@ -225,11 +282,11 @@ public class QueryWizard extends DatabaseObjectWizard i = insertRoadmapItem(0, true, SOFIELDSELECTION_PAGE - 1, SOFIELDSELECTION_PAGE); i = insertRoadmapItem(i, false, SOSORTING_PAGE - 1, SOSORTING_PAGE); // Orderby is always supported i = insertRoadmapItem(i, false, SOFILTER_PAGE - 1, SOFILTER_PAGE); - if (CurDBMetaData.xDBMetaData.supportsCoreSQLGrammar()) + if (m_DBMetaData.xDBMetaData.supportsCoreSQLGrammar()) { - i = insertRoadmapItem(i, CurDBMetaData.hasNumericalFields(), SOAGGREGATE_PAGE - 1, SOAGGREGATE_PAGE); + i = insertRoadmapItem(i, m_DBMetaData.hasNumericalFields(), SOAGGREGATE_PAGE - 1, SOAGGREGATE_PAGE); } - if (CurDBMetaData.xDBMetaData.supportsGroupBy()) + if (m_DBMetaData.xDBMetaData.supportsGroupBy()) { i = insertRoadmapItem(i, false, SOGROUPSELECTION_PAGE - 1, SOGROUPSELECTION_PAGE); i = insertRoadmapItem(i, false, SOGROUPFILTER_PAGE - 1, SOGROUPFILTER_PAGE); @@ -251,28 +308,25 @@ public class QueryWizard extends DatabaseObjectWizard { try { -// curDBCommandFieldSelection = new CommandFieldSelection(this, curFormDocument.oMainFormDBMetaData, 92, slblFields, slblSelFields, slblTables, true, 34411); -// curDBCommandFieldSelection.addFieldSelectionListener(new FieldSelectionListener()); - - CurDBCommandFieldSelection = new CommandFieldSelection(this, CurDBMetaData, 120, reslblFields, reslblSelFields, reslblTables, true, 40850); - CurDBCommandFieldSelection.setAppendMode(true); - CurDBCommandFieldSelection.addFieldSelectionListener(new FieldSelectionListener()); - CurSortingComponent = new SortingComponent(this, SOSORTING_PAGE, 95, 27, 210, 40865); - CurFilterComponent = new FilterComponent(this, xMSF, SOFILTER_PAGE, 97, 27, 209, 3, CurDBMetaData, 40878); - CurFilterComponent.addNumberFormats(); + m_DBCommandFieldSelectio = new CommandFieldSelection(this, m_DBMetaData, 120, reslblFields, reslblSelFields, reslblTables, true, 40850); + m_DBCommandFieldSelectio.setAppendMode(true); + m_DBCommandFieldSelectio.addFieldSelectionListener(new FieldSelectionListener()); + m_sortingComponent = new SortingComponent(this, SOSORTING_PAGE, 95, 27, 210, 40865); + m_filterComponent = new FilterComponent(this, xMSF, SOFILTER_PAGE, 97, 27, 209, 3, m_DBMetaData, 40878); + m_filterComponent.addNumberFormats(); - if (CurDBMetaData.xDBMetaData.supportsCoreSQLGrammar()) + if (m_DBMetaData.xDBMetaData.supportsCoreSQLGrammar()) { - CurAggregateComponent = new AggregateComponent(this, CurDBMetaData, SOAGGREGATE_PAGE, 97, 69, 209, 5, 40895); + m_aggregateComponent = new AggregateComponent(this, m_DBMetaData, SOAGGREGATE_PAGE, 97, 69, 209, 5, 40895); } - if (CurDBMetaData.xDBMetaData.supportsGroupBy()) + if (m_DBMetaData.xDBMetaData.supportsGroupBy()) { - CurGroupFieldSelection = new FieldSelection(this, SOGROUPSELECTION_PAGE, 95, 27, 210, 150, reslblFields, this.reslblGroupBy, 40915, false); - CurGroupFieldSelection.addFieldSelectionListener(new FieldSelectionListener()); - CurGroupFilterComponent = new FilterComponent(this, xMSF, SOGROUPFILTER_PAGE, 97, 27, 209, 3, CurDBMetaData, 40923); + m_groupFieldSelection = new FieldSelection(this, SOGROUPSELECTION_PAGE, 95, 27, 210, 150, reslblFields, this.reslblGroupBy, 40915, false); + m_groupFieldSelection.addFieldSelectionListener(new FieldSelectionListener()); + m_groupFilterComponent = new FilterComponent(this, xMSF, SOGROUPFILTER_PAGE, 97, 27, 209, 3, m_DBMetaData, 40923); } - CurTitlesComponent = new TitlesComponent(this, SOTITLES_PAGE, 97, 37, 207, 7, reslblFieldHeader, reslblAliasHeader, 40940); - CurFinalizer = new Finalizer(this, CurDBMetaData); + m_titlesComponent = new TitlesComponent(this, SOTITLES_PAGE, 97, 37, 207, 7, reslblFieldHeader, reslblAliasHeader, 40940); + m_finalizer = new Finalizer(this, m_DBMetaData); enableNavigationButtons(false, false, false); } catch (com.sun.star.uno.Exception exception) @@ -288,10 +342,10 @@ public class QueryWizard extends DatabaseObjectWizard || ( switchToStep( ncurStep, SOSUMMARY_PAGE ) ) ) { - m_createdQuery = CurFinalizer.finish(); + m_createdQuery = m_finalizer.finish(); if ( m_createdQuery.length() > 0 ) { - loadSubComponent( CommandType.QUERY, m_createdQuery, CurFinalizer.displayQueryDesign() ); + loadSubComponent( CommandType.QUERY, m_createdQuery, m_finalizer.displayQueryDesign() ); xDialog.endExecute(); return true; } @@ -305,11 +359,11 @@ public class QueryWizard extends DatabaseObjectWizard { if (nOldStep <= SOGROUPSELECTION_PAGE && nNewStep > SOGROUPSELECTION_PAGE) { - if (CurDBMetaData.xDBMetaData.supportsGroupBy()) + if (m_DBMetaData.xDBMetaData.supportsGroupBy()) { - CurDBMetaData.setGroupFieldNames(CurGroupFieldSelection.getSelectedFieldNames()); - CurDBMetaData.GroupFieldNames = JavaTools.removeOutdatedFields(CurDBMetaData.GroupFieldNames, CurDBMetaData.NonAggregateFieldNames); - CurDBMetaData.GroupByFilterConditions = JavaTools.removeOutdatedFields(CurDBMetaData.GroupByFilterConditions, CurDBMetaData.GroupFieldNames); + m_DBMetaData.setGroupFieldNames(m_groupFieldSelection.getSelectedFieldNames()); + m_DBMetaData.GroupFieldNames = JavaTools.removeOutdatedFields(m_DBMetaData.GroupFieldNames, m_DBMetaData.NonAggregateFieldNames); + m_DBMetaData.GroupByFilterConditions = JavaTools.removeOutdatedFields(m_DBMetaData.GroupByFilterConditions, m_DBMetaData.GroupFieldNames); } } switch (nNewStep) @@ -317,24 +371,24 @@ public class QueryWizard extends DatabaseObjectWizard case SOFIELDSELECTION_PAGE: break; case SOSORTING_PAGE: - CurSortingComponent.initialize(CurDBMetaData.getDisplayFieldNames(), CurDBMetaData.getSortFieldNames()); + m_sortingComponent.initialize(m_DBMetaData.getDisplayFieldNames(), m_DBMetaData.getSortFieldNames()); break; case SOFILTER_PAGE: - CurFilterComponent.initialize(CurDBMetaData.getFilterConditions(), CurDBMetaData.getDisplayFieldNames()); + m_filterComponent.initialize(m_DBMetaData.getFilterConditions(), m_DBMetaData.getDisplayFieldNames()); break; case SOAGGREGATE_PAGE: - CurAggregateComponent.initialize(); + m_aggregateComponent.initialize(); break; case SOGROUPSELECTION_PAGE: break; case SOGROUPFILTER_PAGE: - CurGroupFilterComponent.initialize(CurDBMetaData.GroupByFilterConditions, CurDBMetaData.getGroupFieldNames()); + m_groupFilterComponent.initialize(m_DBMetaData.GroupByFilterConditions, m_DBMetaData.getGroupFieldNames()); break; case SOTITLES_PAGE: - CurTitlesComponent.initialize(CurDBMetaData.getDisplayFieldNames(), CurDBMetaData.FieldTitleSet); + m_titlesComponent.initialize(m_DBMetaData.getDisplayFieldNames(), m_DBMetaData.FieldTitleSet); break; case SOSUMMARY_PAGE: - CurFinalizer.initialize(); + m_finalizer.initialize(); break; default: break; @@ -351,27 +405,27 @@ public class QueryWizard extends DatabaseObjectWizard switch (nOldStep) { case SOFIELDSELECTION_PAGE: - CurDBMetaData.reorderFieldColumns(CurDBCommandFieldSelection.getSelectedFieldNames()); - CurDBMetaData.initializeFieldTitleSet(true); - CurDBMetaData.setNumericFields(); + m_DBMetaData.reorderFieldColumns(m_DBCommandFieldSelectio.getSelectedFieldNames()); + m_DBMetaData.initializeFieldTitleSet(true); + m_DBMetaData.setNumericFields(); searchForOutdatedFields(); break; case SOSORTING_PAGE: - CurDBMetaData.setSortFieldNames(CurSortingComponent.getSortFieldNames()); + m_DBMetaData.setSortFieldNames(m_sortingComponent.getSortFieldNames()); break; case SOFILTER_PAGE: - CurDBMetaData.setFilterConditions(CurFilterComponent.getFilterConditions()); + m_DBMetaData.setFilterConditions(m_filterComponent.getFilterConditions()); break; case SOAGGREGATE_PAGE: - CurDBMetaData.AggregateFieldNames = CurAggregateComponent.getAggregateFieldNames(); + m_DBMetaData.AggregateFieldNames = m_aggregateComponent.getAggregateFieldNames(); break; case SOGROUPSELECTION_PAGE: break; case SOGROUPFILTER_PAGE: - CurDBMetaData.setGroupByFilterConditions(this.CurGroupFilterComponent.getFilterConditions()); + m_DBMetaData.setGroupByFilterConditions(this.m_groupFilterComponent.getFilterConditions()); break; case SOTITLES_PAGE: - CurDBMetaData.setFieldTitles(CurTitlesComponent.getFieldTitles()); + m_DBMetaData.setFieldTitles(m_titlesComponent.getFieldTitles()); break; case SOSUMMARY_PAGE: break; @@ -382,15 +436,15 @@ public class QueryWizard extends DatabaseObjectWizard { try { - if (CurDBMetaData.Type == QueryMetaData.QueryType.SOSUMMARYQUERY) + if (m_DBMetaData.Type == QueryMetaData.QueryType.SOSUMMARYQUERY) { - if (CurDBMetaData.xDBMetaData.supportsGroupBy()) + if (m_DBMetaData.xDBMetaData.supportsGroupBy()) { - CurDBMetaData.setNonAggregateFieldNames(); - CurGroupFieldSelection.initialize(CurDBMetaData.getUniqueAggregateFieldNames(), false, CurDBMetaData.xDBMetaData.getMaxColumnsInGroupBy()); - CurGroupFieldSelection.intializeSelectedFields(CurDBMetaData.NonAggregateFieldNames); - CurGroupFieldSelection.setMultipleMode(false); - setStepEnabled(SOGROUPFILTER_PAGE, CurAggregateComponent.isGroupingpossible() && CurDBMetaData.NonAggregateFieldNames.length > 0); + m_DBMetaData.setNonAggregateFieldNames(); + m_groupFieldSelection.initialize(m_DBMetaData.getUniqueAggregateFieldNames(), false, m_DBMetaData.xDBMetaData.getMaxColumnsInGroupBy()); + m_groupFieldSelection.intializeSelectedFields(m_DBMetaData.NonAggregateFieldNames); + m_groupFieldSelection.setMultipleMode(false); + setStepEnabled(SOGROUPFILTER_PAGE, m_aggregateComponent.isGroupingpossible() && m_DBMetaData.NonAggregateFieldNames.length > 0); } } } @@ -403,18 +457,18 @@ public class QueryWizard extends DatabaseObjectWizard private void searchForOutdatedFields() { - String[] sFieldNames = CurDBMetaData.getFieldNames(); - String[][] sRemovedFields = JavaTools.removeOutdatedFields(CurDBMetaData.getSortFieldNames(), sFieldNames); - CurDBMetaData.setSortFieldNames(sRemovedFields); - CurDBMetaData.setFilterConditions(JavaTools.removeOutdatedFields(CurDBMetaData.getFilterConditions(), sFieldNames)); - CurDBMetaData.AggregateFieldNames = JavaTools.removeOutdatedFields(CurDBMetaData.AggregateFieldNames, sFieldNames); + String[] sFieldNames = m_DBMetaData.getFieldNames(); + String[][] sRemovedFields = JavaTools.removeOutdatedFields(m_DBMetaData.getSortFieldNames(), sFieldNames); + m_DBMetaData.setSortFieldNames(sRemovedFields); + m_DBMetaData.setFilterConditions(JavaTools.removeOutdatedFields(m_DBMetaData.getFilterConditions(), sFieldNames)); + m_DBMetaData.AggregateFieldNames = JavaTools.removeOutdatedFields(m_DBMetaData.AggregateFieldNames, sFieldNames); } private void enableWizardSteps(String[] NewItems) { boolean bEnabled = NewItems.length > 0; - setControlProperty("btnWizardNext", "Enabled", new Boolean(bEnabled)); - setControlProperty("btnWizardFinish", "Enabled", new Boolean(bEnabled)); + setControlProperty("btnWizardNext", "Enabled", bEnabled); + setControlProperty("btnWizardFinish", "Enabled", bEnabled); enableRoadmapItems(NewItems, bEnabled); // Note: Performancewise this could be improved } @@ -446,15 +500,15 @@ public class QueryWizard extends DatabaseObjectWizard { if (ID == 1) { - CurDBMetaData.addSeveralFieldColumns(SelItems, CurDBCommandFieldSelection.getSelectedCommandName()); + m_DBMetaData.addSeveralFieldColumns(SelItems, m_DBCommandFieldSelectio.getSelectedCommandName()); enableWizardSteps(NewItems); - CurDBCommandFieldSelection.changeSelectedFieldNames(CurDBMetaData.getDisplayFieldNames()); - CurDBCommandFieldSelection.toggleCommandListBox(NewItems); + m_DBCommandFieldSelectio.changeSelectedFieldNames(m_DBMetaData.getDisplayFieldNames()); + m_DBCommandFieldSelectio.toggleCommandListBox(NewItems); } else { - boolean bEnabled = (CurGroupFieldSelection.getSelectedFieldNames().length > 0); - Helper.setUnoPropertyValue(getRoadmapItemByID(SOGROUPFILTER_PAGE), "Enabled", new Boolean(bEnabled)); + boolean bEnabled = (m_groupFieldSelection.getSelectedFieldNames().length > 0); + Helper.setUnoPropertyValue(getRoadmapItemByID(SOGROUPFILTER_PAGE), "Enabled", bEnabled); } } @@ -464,30 +518,30 @@ public class QueryWizard extends DatabaseObjectWizard if (ID == 1) { enableWizardSteps(NewItems); - String[] sSelfieldNames = CurDBMetaData.getFieldNames(SelItems, CurDBCommandFieldSelection.getSelectedCommandName()); - CurDBCommandFieldSelection.addItemsToFieldsListbox(sSelfieldNames); - CurDBMetaData.removeSeveralFieldColumnsByDisplayFieldName(SelItems); - CurDBCommandFieldSelection.toggleCommandListBox(NewItems); + String[] sSelfieldNames = m_DBMetaData.getFieldNames(SelItems, m_DBCommandFieldSelectio.getSelectedCommandName()); + m_DBCommandFieldSelectio.addItemsToFieldsListbox(sSelfieldNames); + m_DBMetaData.removeSeveralFieldColumnsByDisplayFieldName(SelItems); + m_DBCommandFieldSelectio.toggleCommandListBox(NewItems); } else { - boolean bEnabled = (CurGroupFieldSelection.getSelectedFieldNames().length > 0); + boolean bEnabled = (m_groupFieldSelection.getSelectedFieldNames().length > 0); String CurDisplayFieldName = SelItems[0]; - if (JavaTools.FieldInList(CurDBMetaData.NonAggregateFieldNames, CurDisplayFieldName) > -1) + if (JavaTools.FieldInList(m_DBMetaData.NonAggregateFieldNames, CurDisplayFieldName) > -1) { showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, resmsgNonNumericAsGroupBy); - CurGroupFieldSelection.xSelectedFieldsListBox.addItems(SelItems, CurGroupFieldSelection.xSelectedFieldsListBox.getItemCount()); - String FieldList[] = CurGroupFieldSelection.xFieldsListBox.getItems(); + m_groupFieldSelection.xSelectedFieldsListBox.addItems(SelItems, m_groupFieldSelection.xSelectedFieldsListBox.getItemCount()); + String FieldList[] = m_groupFieldSelection.xFieldsListBox.getItems(); int index = JavaTools.FieldInList(FieldList, CurDisplayFieldName); if (index > -1) { - CurGroupFieldSelection.xFieldsListBox.removeItems((short) index, (short) 1); + m_groupFieldSelection.xFieldsListBox.removeItems((short) index, (short) 1); } } else { - Helper.setUnoPropertyValue(getRoadmapItemByID(SOGROUPFILTER_PAGE), "Enabled", new Boolean(bEnabled)); + Helper.setUnoPropertyValue(getRoadmapItemByID(SOGROUPFILTER_PAGE), "Enabled", bEnabled); } } } diff --git a/wizards/com/sun/star/wizards/query/makefile.mk b/wizards/com/sun/star/wizards/query/makefile.mk index af5056ba5..080076668 100644 --- a/wizards/com/sun/star/wizards/query/makefile.mk +++ b/wizards/com/sun/star/wizards/query/makefile.mk @@ -59,3 +59,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/query.component + +$(MISC)/query.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + query.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt query.component diff --git a/wizards/com/sun/star/wizards/query/query.component b/wizards/com/sun/star/wizards/query/query.component new file mode 100644 index 000000000..d1d708c6b --- /dev/null +++ b/wizards/com/sun/star/wizards/query/query.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Java2" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name= + "com.sun.star.wizards.query.CallQueryWizard$QueryWizardImplementation"> + <service name="com.sun.star.wizards.query.CallQueryWizard"/> + </implementation> +</component> diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java index 78b67263e..47d846183 100644 --- a/wizards/com/sun/star/wizards/report/CallReportWizard.java +++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java @@ -35,9 +35,7 @@ import com.sun.star.sdb.application.XDatabaseDocumentUI; import com.sun.star.wizards.common.NamedValueCollection; /** This class capsulates the class, that implements the minimal component, a - * factory for creating the service (<CODE>__getServiceFactory</CODE>) and a - * method, that writes the information into the given registry key - * (<CODE>__writeRegistryServiceInfo</CODE>). + * factory for creating the service (<CODE>__getServiceFactory</CODE>). * @author Bertram Nolte */ public class CallReportWizard @@ -94,22 +92,6 @@ public class CallReportWizard return xsingleservicefactory; } - /** Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code>. - * @return returns true if the operation succeeded - * @see com.sun.star.comp.loader.JavaLoader# - * @param xregistrykey Makes structural information (except regarding tree - * structures) of a single - * registry key accessible. - */ - public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey) - { - return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo( - ReportWizardImplementation.class.getName(), - ReportWizardImplementation.__serviceName, - xregistrykey); - } - /** This class implements the component. At least the interfaces XServiceInfo, * XTypeProvider, and XInitialization should be provided by the service. */ diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java index 9b1d993c8..e8c533cb8 100644 --- a/wizards/com/sun/star/wizards/report/Dataimport.java +++ b/wizards/com/sun/star/wizards/report/Dataimport.java @@ -178,7 +178,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi }, new Object[] { - new Integer(14), "HID:34321", new Integer(74), new Integer(58), new Integer(0), new Short((short) 1), new Integer(40), sStop + new Integer(14), HelpIds.getHelpIdString(34321), new Integer(74), new Integer(58), new Integer(0), new Short((short) 1), new Integer(40), sStop }); createWindowPeer(CurReportDocument.getWizardParent()); calculateDialogPosition(CurReportDocument.getFrame().getComponentWindow().getPosSize()); diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java index 05253f45d..5573fe0c2 100644 --- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java +++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java @@ -104,7 +104,7 @@ public class ReportFinalizer }, new Object[] { - new Integer(12), "HID:34362", new Integer(95), new Integer(37), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(209) + new Integer(12), "HID:WIZARDS_HID_DLGREPORT_4_TITLE", new Integer(95), new Integer(37), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(209) }); CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblChooseReportKind", @@ -124,7 +124,7 @@ public class ReportFinalizer }, new Object[] { - new Integer(10), "HID:34371", sSaveAsDocument, new Integer(95), new Integer(69), new Short((short) 0), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(138) + new Integer(10), "HID:WIZARDS_HID_DLGREPORT_5_OPTSTATDOCUMENT", sSaveAsDocument, new Integer(95), new Integer(69), new Short((short) 0), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(138) }); CurUnoDialog.insertRadioButton("optCreateReportTemplate", TOGGLESUBTEMPLATECONTROLS_FUNCNAME, this, @@ -134,7 +134,7 @@ public class ReportFinalizer }, new Object[] { - new Integer(8), "HID:34370", sSaveAsTemplate, new Integer(95), new Integer(81), new Short((short) 1), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(209) + new Integer(8), "HID:WIZARDS_HID_DLGREPORT_5_OPTDYNTEMPLATE", sSaveAsTemplate, new Integer(95), new Integer(81), new Short((short) 1), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(209) }); @@ -156,7 +156,7 @@ public class ReportFinalizer }, new Object[] { - new Integer(10), "HID:34374", sEditTemplate, new Integer(111), new Integer(105), new Integer(6), new Short(curtabindex++), new Integer(138) + new Integer(10), "HID:WIZARDS_HID_DLGREPORT_5_OPTEDITTEMPLATE", sEditTemplate, new Integer(111), new Integer(105), new Integer(6), new Short(curtabindex++), new Integer(138) }); CurUnoDialog.insertRadioButton("optUseTemplate", TOGGLESUBTEMPLATECONTROLS_FUNCNAME, this, @@ -166,7 +166,7 @@ public class ReportFinalizer }, new Object[] { - new Integer(10), "HID:34375", sUseTemplate, new Integer(111), new Integer(115), new Short((short) 1), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(138) + new Integer(10), "HID:WIZARDS_HID_DLGREPORT_5_OPTUSETEMPLATE", sUseTemplate, new Integer(111), new Integer(115), new Short((short) 1), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(138) }); } diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index d05bc2cf4..9b4b9b777 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -115,7 +115,7 @@ public class ReportLayouter }, new Object[] { - new Integer(108), "HID:34363", new Integer(95), new Integer(37), new short[] + new Integer(108), "HID:WIZARDS_HID_DLGREPORT_4_DATALAYOUT", new Integer(95), new Integer(37), new short[] { iSelPos }, new Integer(ReportWizard.SOTEMPLATEPAGE), ContentFiles[0], new Short(curtabindex++), new Integer(99) @@ -150,7 +150,7 @@ public class ReportLayouter }, new Object[] { - new Integer(108), "HID:34364", new Integer(205), new Integer(37), new short[] + new Integer(108), "HID:WIZARDS_HID_DLGREPORT_4_PAGELAYOUT", new Integer(205), new Integer(37), new short[] { iSelLayoutPos }, new Integer(ReportWizard.SOTEMPLATEPAGE), LayoutFiles[0], new Short(curtabindex++), new Integer(99) @@ -174,7 +174,7 @@ public class ReportLayouter }, new Object[] { - new Integer(10), "HID:34365", sOrientHorizontal, new Integer(101), new Integer(158), new Short(m_nLandscapeState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60) + new Integer(10), "HID:WIZARDS_HID_DLGREPORT_4_LANDSCAPE", sOrientHorizontal, new Integer(101), new Integer(158), new Short(m_nLandscapeState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60) }); short m_nPortraitState = CurReportDocument.getDefaultPageOrientation() == SOOPTPORTRAIT ? (short) 1 : (short) 0; @@ -185,7 +185,7 @@ public class ReportLayouter }, new Object[] { - new Integer(10), "HID:34366", sOrientVertical, new Integer(101), new Integer(171), new Short(m_nPortraitState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60) + new Integer(10), "HID:WIZARDS_HID_DLGREPORT_4_PORTRAIT", sOrientVertical, new Integer(101), new Integer(171), new Short(m_nPortraitState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60) }); aOrientationImage = CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlImageControlModel", "imgOrientation", diff --git a/wizards/com/sun/star/wizards/report/makefile.mk b/wizards/com/sun/star/wizards/report/makefile.mk index b31639d21..62b948674 100644 --- a/wizards/com/sun/star/wizards/report/makefile.mk +++ b/wizards/com/sun/star/wizards/report/makefile.mk @@ -66,3 +66,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/report.component + +$(MISC)/report.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + report.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt report.component diff --git a/wizards/com/sun/star/wizards/report/report.component b/wizards/com/sun/star/wizards/report/report.component new file mode 100644 index 000000000..67efca927 --- /dev/null +++ b/wizards/com/sun/star/wizards/report/report.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Java2" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name= + "com.sun.star.wizards.report.CallReportWizard$ReportWizardImplementation"> + <service name="com.sun.star.wizards.report.CallReportWizard"/> + </implementation> +</component> diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java index 4b992a5ea..cac3a18a0 100644 --- a/wizards/com/sun/star/wizards/table/CallTableWizard.java +++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java @@ -32,9 +32,7 @@ import com.sun.star.uno.Type; import com.sun.star.wizards.common.Properties; /** This class capsulates the class, that implements the minimal component, a - * factory for creating the service (<CODE>__getServiceFactory</CODE>) and a - * method, that writes the information into the given registry key - * (<CODE>__writeRegistryServiceInfo</CODE>). + * factory for creating the service (<CODE>__getServiceFactory</CODE>). * @author Bertram Nolte */ public class CallTableWizard @@ -63,19 +61,6 @@ public class CallTableWizard return xsingleservicefactory; } - /** Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code>. - * @return returns true if the operation succeeded - * @see com.sun.star.comp.loader.JavaLoader# - * @param xregistrykey Makes structural information (except regarding tree - * structures) of a single - * registry key accessible. - */ - public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey) - { - return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(TableWizardImplementation.class.getName(), TableWizardImplementation.__serviceName, xregistrykey); - } - /** This class implements the component. At least the interfaces XServiceInfo, * XTypeProvider, and XInitialization should be provided by the service. */ diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java index 3c9a8997e..3547712f0 100644 --- a/wizards/com/sun/star/wizards/table/FieldFormatter.java +++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java @@ -95,7 +95,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - new Integer(133), "HID:41220", new Integer(92), new Integer(37), IFieldFormatStep, new Short(curtabindex++), new Integer(62) + new Integer(133), "HID:WIZARDS_HID_DLGTABLE_LB_SELFIELDNAMES", new Integer(92), new Integer(37), IFieldFormatStep, new Short(curtabindex++), new Integer(62) }); } catch (Exception e) @@ -113,7 +113,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - Boolean.FALSE, oFontDesc, new Integer(14), "HID:41221", String.valueOf((char) 8743), new Integer(158), new Integer(139), IFieldFormatStep, new Short(curtabindex++), new Integer(14) + Boolean.FALSE, oFontDesc, new Integer(14), "HID:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDUP", String.valueOf((char) 8743), new Integer(158), new Integer(139), IFieldFormatStep, new Short(curtabindex++), new Integer(14) }); btnShiftDown = CurUnoDialog.insertButton("btnShiftDown", "shiftFieldNameDown", this, @@ -123,7 +123,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - Boolean.FALSE, oFontDesc, new Integer(14), "HID:41222", String.valueOf((char) 8744), new Integer(158), new Integer(156), IFieldFormatStep, new Short(curtabindex++), new Integer(14) + Boolean.FALSE, oFontDesc, new Integer(14), "HID:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDDOWN", String.valueOf((char) 8744), new Integer(158), new Integer(156), IFieldFormatStep, new Short(curtabindex++), new Integer(14) }); oFontDesc = new FontDescriptor(); oFontDesc.Weight = com.sun.star.awt.FontWeight.BOLD; @@ -135,7 +135,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - oFontDesc, new Integer(14), "HID:41223", "-", new Integer(118), new Integer(175), IFieldFormatStep, new Short(curtabindex++), new Integer(14) + oFontDesc, new Integer(14), "HID:WIZARDS_HID_DLGTABLE_CMDMINUS", "-", new Integer(118), new Integer(175), IFieldFormatStep, new Short(curtabindex++), new Integer(14) }); btnplus = CurUnoDialog.insertButton("btnplus", "addFieldName", this, @@ -145,7 +145,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - oFontDesc, new Integer(14), "HID:41224", "+", new Integer(137), new Integer(175), IFieldFormatStep, new Short(curtabindex++), new Integer(14) + oFontDesc, new Integer(14), "HID:WIZARDS_HID_DLGTABLE_CMDPLUS", "+", new Integer(137), new Integer(175), IFieldFormatStep, new Short(curtabindex++), new Integer(14) }); CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedLineModel", "ColDescriptorHeader", @@ -176,7 +176,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - UIConsts.INTEGER_12, "HID:41225", new Integer(274), new Integer(37), IFieldFormatStep, new Short(curtabindex++), "", new Integer(50) + UIConsts.INTEGER_12, "HID:WIZARDS_HID_DLGTABLE_COLNAME", new Integer(274), new Integer(37), IFieldFormatStep, new Short(curtabindex++), "", new Integer(50) }); txtfieldname.addTextListener(CurUnoDialog); CurUnoDialog.getPeerConfiguration().setAccessibleName(btnplus, sbtnplushelptext); @@ -195,7 +195,7 @@ public class FieldFormatter implements XItemListener new Object[] { new Integer(85), new Integer(158), new Integer(49), IFieldFormatStep, new Short(curtabindex++), new Integer(166), new Integer(50) - }); //, "HID:41226" + }); //, "HID:WIZARDS_HID_DLGTABLE_COLMODIFIER" curTableDescriptor = _curTableDescriptor; Helper.setUnoPropertyValue(oColumnDescriptorModel, "ActiveConnection", _curTableDescriptor.DBConnection); txtfieldname.setMaxTextLen((short) this.curTableDescriptor.getMaxColumnNameLength()); diff --git a/wizards/com/sun/star/wizards/table/Finalizer.java b/wizards/com/sun/star/wizards/table/Finalizer.java index 94636532e..b86e2a698 100644 --- a/wizards/com/sun/star/wizards/table/Finalizer.java +++ b/wizards/com/sun/star/wizards/table/Finalizer.java @@ -91,7 +91,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGER_12, "HID:41240", new Integer(97), new Integer(35), IFINALSTEP, new Short(curtabindex++), "", new Integer(223) + UIConsts.INTEGER_12, "HID:WIZARDS_HID_DLGTABLE_TXT_NAME", new Integer(97), new Integer(35), IFINALSTEP, new Short(curtabindex++), "", new Integer(223) }); txtTableName.addTextListener(CurUnoDialog); txtTableName.setMaxTextLen((short) this.curtabledescriptor.getMaxTableNameLength()); @@ -130,7 +130,7 @@ public class Finalizer }, new Object[] { - Boolean.TRUE, new Integer(12), "HID:41244", new Short(UnoDialog.getListBoxLineCount()), new Integer(nListBoxPosX), new Integer(62), IFINALSTEP, sCatalogNames, new Short(curtabindex++), new Integer(80) + Boolean.TRUE, new Integer(12), "HID:WIZARDS_HID_DLGTABLE_LST_CATALOG", new Short(UnoDialog.getListBoxLineCount()), new Integer(nListBoxPosX), new Integer(62), IFINALSTEP, sCatalogNames, new Short(curtabindex++), new Integer(80) }); int isel = JavaTools.FieldInList(sCatalogNames, sCatalog); if (isel < 0) @@ -185,7 +185,7 @@ public class Finalizer }, new Object[] { - Boolean.TRUE, new Integer(12), "HID:41245", new Short(UnoDialog.getListBoxLineCount()), new Integer(nListBoxPosX), new Integer(62), IFINALSTEP, sSchemaNames, new Short(curtabindex++), new Integer(80) + Boolean.TRUE, new Integer(12), "HID:WIZARDS_HID_DLGTABLE_LST_SCHEMA", new Short(UnoDialog.getListBoxLineCount()), new Integer(nListBoxPosX), new Integer(62), IFINALSTEP, sSchemaNames, new Short(curtabindex++), new Integer(80) }); int isel = JavaTools.FieldInList(sSchemaNames, sSchema); if (isel < 0) @@ -236,7 +236,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], "HID:41242", sWorkWithTable, new Integer(101), new Integer(97 + ndiffPosY), new Short((short) 1), IFINALSTEP, new Short(curtabindex++), new Integer(177) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE", sWorkWithTable, new Integer(101), new Integer(97 + ndiffPosY), new Short((short) 1), IFINALSTEP, new Short(curtabindex++), new Integer(177) }); optModifyTable = CurUnoDialog.insertRadioButton("optModifyTable", null, new String[] @@ -245,7 +245,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], "HID:41241", sModifyTable, new Integer(101), new Integer(109 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), new Integer(177) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE", sModifyTable, new Integer(101), new Integer(109 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), new Integer(177) }); optStartFormWizard = CurUnoDialog.insertRadioButton("optStartFormWizard", null, new String[] @@ -254,7 +254,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], "HID:41243", sStartFormWizard, new Integer(101), new Integer(121 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), new Integer(177) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD", sStartFormWizard, new Integer(101), new Integer(121 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), new Integer(177) }); } catch (SQLException e) diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java index 6f7ecb289..4880c8735 100644 --- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java +++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java @@ -99,7 +99,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, new Object[] { - UIConsts.INTEGERS[8], "HID:41227", screatePrimaryKey, new Integer(97), new Integer(70), new Short((short) 1), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(160) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_CHK_USEPRIMEKEY", screatePrimaryKey, new Integer(97), new Integer(70), new Short((short) 1), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(160) }); optAddAutomatically = CurUnoDialog.insertRadioButton("optAddAutomatically", SPRIMEKEYMODE, this, @@ -109,7 +109,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, new Object[] { - UIConsts.INTEGERS[8], "HID:41228", sAddAutomatically, new Integer(106), new Integer(82), new Short((short) 1), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_PK_AUTOMATIC", sAddAutomatically, new Integer(106), new Integer(82), new Short((short) 1), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200) }); optUseExisting = CurUnoDialog.insertRadioButton("optUseExisting", SPRIMEKEYMODE, this, @@ -119,7 +119,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, //94 new Object[] { - UIConsts.INTEGERS[8], "HID:41230", sUseExisting, new Integer(106), new Integer(104), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_PK_SINGLE", sUseExisting, new Integer(106), new Integer(104), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200) }); optUseSeveral = CurUnoDialog.insertRadioButton("optUseSeveral", SPRIMEKEYMODE, this, @@ -129,7 +129,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, new Object[] { - UIConsts.INTEGERS[8], "HID:41233", sUseSeveral, new Integer(106), new Integer(132), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_PK_SEVERAL", sUseSeveral, new Integer(106), new Integer(132), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200) }); chkApplyAutoValueAutomatic = CurUnoDialog.insertCheckBox("chkApplyAutoValueAutomatic", SPRIMEKEYMODE, this, @@ -139,7 +139,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, //107 new Object[] { - UIConsts.INTEGERS[8], "HID:41229", sApplyAutoValue, new Integer(116), new Integer(92), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(68) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC", sApplyAutoValue, new Integer(116), new Integer(92), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(68) }); lblPrimeFieldName = CurUnoDialog.insertLabel("lblPrimeFieldName", @@ -171,7 +171,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener Boolean.TRUE, Boolean.FALSE, new Integer(12), - "HID:41231", + "HID:WIZARDS_HID_DLGTABLE_LB_PK_FIELDNAME", Short.valueOf(UnoDialog.getListBoxLineCount()), new Integer(162), new Integer(115), @@ -187,7 +187,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, //107 new Object[] { - UIConsts.INTEGERS[8], "HID:41232", sApplyAutoValue, new Integer(248), new Integer(117), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(66) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE", sApplyAutoValue, new Integer(248), new Integer(117), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(66) }); curPrimaryKeySelection = new FieldSelection(CurUnoDialog, IPRIMEKEYSTEP.intValue(), 116, 142, 208, 47, slblAvailableFields, slblSelPrimaryFields, 41234, false); curPrimaryKeySelection.addFieldSelectionListener(this); diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java index 6f6ae92fc..23a48772a 100644 --- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java +++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java @@ -123,7 +123,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X }, new Object[] { - UIConsts.INTEGERS[8], "HID:41206", sBusiness, new Integer(98), new Integer(70), new Short((short) 1), IMAINSTEP, new Short(pretabindex++), new Integer(78) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPTBUSINESS", sBusiness, new Integer(98), new Integer(70), new Short((short) 1), IMAINSTEP, new Short(pretabindex++), new Integer(78) }); optPrivate = CurTableWizardUnoDialog.insertRadioButton("optPrivate", SELECTCATEGORY, this, @@ -133,7 +133,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X }, new Object[] { - UIConsts.INTEGERS[8], "HID:41207", sPrivate, new Integer(182), new Integer(70), IMAINSTEP, new Short(pretabindex++), new Integer(90) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPTPRIVATE", sPrivate, new Integer(182), new Integer(70), IMAINSTEP, new Short(pretabindex++), new Integer(90) }); CurUnoDialog.insertLabel("lblTableNames", @@ -155,7 +155,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X }, new Object[] { - Boolean.TRUE, new Integer(12), "HID:41208", new Short(UnoDialog.getListBoxLineCount()), new Integer(91), new Integer(92), IMAINSTEP, new Short(pretabindex++), getListboxWidth() + Boolean.TRUE, new Integer(12), "HID:WIZARDS_HID_DLGTABLE_LBTABLES", new Short(UnoDialog.getListBoxLineCount()), new Integer(91), new Integer(92), IMAINSTEP, new Short(pretabindex++), getListboxWidth() }); } catch (Exception e) diff --git a/wizards/com/sun/star/wizards/table/makefile.mk b/wizards/com/sun/star/wizards/table/makefile.mk index c0d62baa7..4343af99d 100644 --- a/wizards/com/sun/star/wizards/table/makefile.mk +++ b/wizards/com/sun/star/wizards/table/makefile.mk @@ -63,3 +63,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/table.component + +$(MISC)/table.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + table.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt table.component diff --git a/wizards/com/sun/star/wizards/table/table.component b/wizards/com/sun/star/wizards/table/table.component new file mode 100644 index 000000000..24cacd225 --- /dev/null +++ b/wizards/com/sun/star/wizards/table/table.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Java2" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name= + "com.sun.star.wizards.table.CallTableWizard$TableWizardImplementation"> + <service name="com.sun.star.wizards.table.CallTableWizard"/> + </implementation> +</component> diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index 55ae22803..7272896fd 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -30,7 +30,6 @@ import java.util.Vector; import com.sun.star.wizards.common.*; import com.sun.star.wizards.db.*; import com.sun.star.lang.EventObject; -//import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.beans.*; import com.sun.star.sdbc.SQLException; import com.sun.star.uno.AnyConverter; @@ -89,7 +88,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - new Integer(8), "HID:" + curHelpID, soptDetailQuery, new Integer(_iPosX), new Integer(iCompPosY - 42), new Short((short) 1), IStep, new Short(curtabindex++), new Integer(iCompWidth) + new Integer(8), HelpIds.getHelpIdString(curHelpID), soptDetailQuery, new Integer(_iPosX), new Integer(iCompPosY - 42), new Short((short) 1), IStep, new Short(curtabindex++), new Integer(iCompWidth) }); optSummaryQuery = CurUnoDialog.insertRadioButton("optSummaryQuery", 0, new ActionListenerImpl(), @@ -99,7 +98,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - new Integer(16), "HID:" + (curHelpID + 1), soptSummaryQuery, Boolean.TRUE, new Integer(_iPosX), new Integer(iCompPosY - 32), IStep, new Short(curtabindex++), new Integer(iCompWidth) + new Integer(16), HelpIds.getHelpIdString(curHelpID + 1), soptSummaryQuery, Boolean.TRUE, new Integer(_iPosX), new Integer(iCompPosY - 32), IStep, new Short(curtabindex++), new Integer(iCompWidth) }); CurUnoDialog.insertLabel("lblAggregate", new String[] @@ -132,7 +131,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - oFontDescriptor, new Integer(14), "HID:" + (lastHelpIndex + 1), "+", new Integer(_iPosX + iCompWidth - 36), new Integer(iButtonPosY), IStep, new Short((curtabindex++)), new Integer(16) + oFontDescriptor, new Integer(14), HelpIds.getHelpIdString(lastHelpIndex + 1), "+", new Integer(_iPosX + iCompWidth - 36), new Integer(iButtonPosY), IStep, new Short((curtabindex++)), new Integer(16) }); CurUnoDialog.insertButton("btnminus", SOREMOVEROW, new ActionListenerImpl(), new String[] @@ -141,7 +140,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - oFontDescriptor, new Integer(14), "HID:" + (lastHelpIndex + 2), "-", new Integer(_iPosX + iCompWidth - 16), new Integer(iButtonPosY), IStep, new Short(curtabindex++), new Integer(16) + oFontDescriptor, new Integer(14), HelpIds.getHelpIdString(lastHelpIndex + 2), "-", new Integer(_iPosX + iCompWidth - 16), new Integer(iButtonPosY), IStep, new Short(curtabindex++), new Integer(16) }); CurDBMetaData.Type = getQueryType(); } @@ -533,7 +532,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - Boolean.TRUE, new Integer(12), "HID:" + _curHelpID++, new Integer(iCompPosX + 4), new Integer(ypos), UIConsts.INVISIBLESTEP, sFunctions, new Short(curtabindex++), new Integer(88) + Boolean.TRUE, new Integer(12), HelpIds.getHelpIdString(_curHelpID++), new Integer(iCompPosX + 4), new Integer(ypos), UIConsts.INVISIBLESTEP, sFunctions, new Short(curtabindex++), new Integer(88) }); xFieldListBox = CurUnoDialog.insertListBox(getFieldsControlName(index), 1, null, new ItemListenerImpl(), @@ -543,7 +542,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - Boolean.TRUE, new Integer(12), "HID:" + _curHelpID++, new Integer(iCompPosX + 98), new Integer(ypos), UIConsts.INVISIBLESTEP, new Short(curtabindex++), new Integer(86) + Boolean.TRUE, new Integer(12), HelpIds.getHelpIdString(_curHelpID++), new Integer(iCompPosX + 98), new Integer(ypos), UIConsts.INVISIBLESTEP, new Short(curtabindex++), new Integer(86) }); lastHelpIndex = _curHelpID - 1; } diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index e14a06b4e..aacae9848 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -34,16 +34,15 @@ import com.sun.star.awt.XControlModel; import com.sun.star.awt.XFixedText; import com.sun.star.awt.XItemEventBroadcaster; import com.sun.star.awt.XItemListener; -// import com.sun.star.awt.XView; import com.sun.star.awt.XWindow; import com.sun.star.lang.EventObject; import com.sun.star.uno.UnoRuntime; import com.sun.star.wizards.common.Helper; import com.sun.star.wizards.common.IRenderer; import com.sun.star.wizards.common.PropertySetHelper; -// import com.sun.star.wizards.ui.event.*; import javax.swing.ListModel; import javax.swing.event.ListDataEvent; +import com.sun.star.wizards.common.HelpIds; /** * @@ -165,7 +164,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener btnBack = dialog.insertButton(m_aControlName + "_btnBack", "prevPage", this, pNames1, new Object[] { btnSize, - "HID:" + helpURL++, + HelpIds.getHelpIdString(helpURL++), Integer.valueOf(pos.Width), Integer.valueOf(pos.Height + (m_aButtonSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1), step, @@ -177,7 +176,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener btnNext = dialog.insertButton(m_aControlName + "_btnNext", "nextPage", this, pNames1, new Object[] { btnSize, - "HID:" + helpURL++, + HelpIds.getHelpIdString(helpURL++), Integer.valueOf(pos.Width + (m_aButtonSize.Width + gap.Width) * cols + gap.Width - btnSize.intValue() + 1), Integer.valueOf(pos.Height + (m_aButtonSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1), step, @@ -256,7 +255,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener /* Short.valueOf((short) 1), */ /* NO_BORDER, */ /* BACKGROUND_COLOR, */ m_aButtonHeight, - "HID:" + helpURL++, + HelpIds.getHelpIdString(helpURL++), /* "Test", */ Integer.valueOf(nButtonX), Integer.valueOf(nButtonY), diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java index 5bb10f184..16e6fd900 100644 --- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java @@ -152,7 +152,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator }, new Object[] { - Boolean.TRUE, Boolean.FALSE, new Integer(12), "HID:" + (super.FirstHelpIndex - 1), new Short(UnoDialog.getListBoxLineCount()), new Integer(95), new Integer(37), IStep, new Short((short) 4), getListboxWidth() + Boolean.TRUE, Boolean.FALSE, new Integer(12), HelpIds.getHelpIdString(super.FirstHelpIndex - 1), new Short(UnoDialog.getListBoxLineCount()), new Integer(95), new Integer(37), IStep, new Short((short) 4), getListboxWidth() }); // XWindow xTableListBoxWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, xTableListBox); fillupCommandListBox(); diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java index 037ad93ff..ae1e2269f 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -32,6 +32,7 @@ import com.sun.star.beans.*; import com.sun.star.awt.*; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.wizards.common.*; +import com.sun.star.wizards.common.HelpIds; import java.util.*; @@ -133,7 +134,7 @@ public abstract class ControlScroller }, new Object[] { - new Short((short) 0), new Boolean(true), new Integer(ScrollHeight), "HID:" + curHelpIndex, new Integer(ScrollBarOrientation.VERTICAL), new Integer(iCompPosX + iCompWidth - iScrollBarWidth - 1), new Integer(iCompPosY + 1), IStep, new Integer(iScrollBarWidth) + new Short((short) 0), new Boolean(true), new Integer(ScrollHeight), HelpIds.getHelpIdString(curHelpIndex), new Integer(ScrollBarOrientation.VERTICAL), new Integer(iCompPosX + iCompWidth - iScrollBarWidth - 1), new Integer(iCompPosY + 1), IStep, new Integer(iScrollBarWidth) }); scrollfields = new Vector(); int ypos = iStartPosY + SORELFIRSTPOSY; diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java index 021526622..75c97c685 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -28,7 +28,7 @@ package com.sun.star.wizards.ui; import com.sun.star.awt.FontDescriptor; import com.sun.star.awt.XListBox; -// import com.sun.star.wizards.common.*; +import com.sun.star.wizards.common.*; import com.sun.star.wizards.common.JavaTools; import java.util.*; @@ -241,7 +241,7 @@ public class FieldSelection }, new Object[] { - ListBoxHeight, "HID:" + Integer.toString(_FirstHelpIndex), Boolean.TRUE, new Integer(CompPosX), ListBoxPosY, IStep, new Short((curtabindex++)), ListBoxWidth + ListBoxHeight, HelpIds.getHelpIdString(_FirstHelpIndex), Boolean.TRUE, new Integer(CompPosX), ListBoxPosY, IStep, new Short((curtabindex++)), ListBoxWidth }); Object btnmoveselected = CurUnoDialog.insertButton("cmdMoveSelected" + sIncSuffix, SOCMDMOVESEL, new ActionListenerImpl(), @@ -251,7 +251,7 @@ public class FieldSelection }, new Object[] { - Boolean.FALSE, new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 1), ">", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth + Boolean.FALSE, new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 1), ">", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth }); if (bshowFourButtons == true) @@ -263,7 +263,7 @@ public class FieldSelection }, new Object[] { - new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 2), ">>", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth + new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 2), ">>", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth }); } Object btnremoveselected = CurUnoDialog.insertButton("cmdRemoveSelected" + sIncSuffix, SOCMDREMOVESEL, new ActionListenerImpl(), @@ -273,7 +273,7 @@ public class FieldSelection }, new Object[] { - Boolean.FALSE, new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 3), "<", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth + Boolean.FALSE, new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 3), "<", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth }); if (bshowFourButtons == true) @@ -285,7 +285,7 @@ public class FieldSelection }, new Object[] { - new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 4), "<<", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth + new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 4), "<<", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth }); } @@ -311,7 +311,7 @@ public class FieldSelection }, new Object[] { - ListBoxHeight, "HID:" + Integer.toString(_FirstHelpIndex + 5), Boolean.TRUE, SelListBoxPosX, ListBoxPosY, IStep, new Short(curtabindex++), ListBoxWidth + ListBoxHeight, HelpIds.getHelpIdString(_FirstHelpIndex + 5), Boolean.TRUE, SelListBoxPosX, ListBoxPosY, IStep, new Short(curtabindex++), ListBoxWidth }); Object btnmoveup = CurUnoDialog.insertButton("cmdMoveUp" + sIncSuffix, SOCMDMOVEUP, new ActionListenerImpl(), @@ -321,7 +321,7 @@ public class FieldSelection }, new Object[] { - Boolean.FALSE, oFontDesc, new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 6), String.valueOf((char) 8743), cmdMoveButtonPosX, MoveButtonPosY[0], IStep, new Short(curtabindex++), CmdButtonWidth + Boolean.FALSE, oFontDesc, new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 6), String.valueOf((char) 8743), cmdMoveButtonPosX, MoveButtonPosY[0], IStep, new Short(curtabindex++), CmdButtonWidth }); Object btnmovedown = CurUnoDialog.insertButton("cmdMoveDown" + sIncSuffix, SOCMDMOVEDOWN, new ActionListenerImpl(), @@ -331,7 +331,7 @@ public class FieldSelection }, new Object[] { - Boolean.FALSE, oFontDesc, new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 7), String.valueOf((char) 8744), cmdMoveButtonPosX, MoveButtonPosY[1], IStep, new Short(curtabindex++), CmdButtonWidth + Boolean.FALSE, oFontDesc, new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 7), String.valueOf((char) 8744), cmdMoveButtonPosX, MoveButtonPosY[1], IStep, new Short(curtabindex++), CmdButtonWidth }); CurUnoDialog.getPeerConfiguration().setAccessibleName(btnmoveselected, AccessTextMoveSelected); diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index 25c0f8dc2..1416a90a3 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -27,7 +27,6 @@ package com.sun.star.wizards.ui; // import java.util.Vector; -import com.sun.star.awt.ItemEvent; import com.sun.star.awt.TextEvent; import com.sun.star.awt.VclWindowPeerAttribute; import com.sun.star.awt.XControl; @@ -40,20 +39,22 @@ import com.sun.star.beans.XPropertySet; import com.sun.star.lang.EventObject; import com.sun.star.lang.IllegalArgumentException; import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lib.uno.helper.PropertySet; +import com.sun.star.sdb.SQLFilterOperator; import com.sun.star.sdbc.DataType; import com.sun.star.uno.Any; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.Exception; import com.sun.star.uno.Type; +import com.sun.star.uno.TypeClass; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; import com.sun.star.wizards.common.NumberFormatter; import com.sun.star.wizards.common.Helper; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.common.JavaTools; -import com.sun.star.wizards.common.Properties; import com.sun.star.wizards.db.FieldColumn; import com.sun.star.wizards.db.QueryMetaData; +import com.sun.star.wizards.db.SQLQueryComposer; import java.util.logging.Level; import java.util.logging.Logger; @@ -61,19 +62,9 @@ public class FilterComponent { private Integer IStep; - // private int iStartPosX; - // private int iStartPosY; - // int Count; private int RowCount; - // private int FilterCount; private static String[] sLogicOperators; - private static String[] sBooleanValues; - // private /* public */ String[] FieldNames; - private XRadioButton optMatchAll; private XRadioButton optMatchAny; - // private String soptMatchAll; - // private String soptMatchAny; - // private String[] sHeadLines; private String slblFieldNames; private String slblOperators; private String slblValue; @@ -81,7 +72,6 @@ public class FilterComponent private int BaseID = 2300; private String sIncSuffix; private ControlRow[] oControlRows; - // private Vector FilterNames; private String sDuplicateCondition; final int SOOPTORMODE = 100; final int SOOPTANDMODE = 101; @@ -127,20 +117,16 @@ public class FilterComponent final int SO_OPTQUERYMODE = 5; int SOI_MATCHALL = 0; int SOI_MATCHANY = 1; - // int ifilterstate = SOI_MATCHALL; int curHelpID; class ItemListenerImpl implements com.sun.star.awt.XItemListener { - public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject) { int iKey = CurUnoDialog.getControlKey(EventObject.Source, CurUnoDialog.ControlList); String sControlName = ""; switch (iKey) { - // case SOOPTQUERYMODE: - // getfilterstate(); case SO_FIRSTFIELDNAME: case SO_SECONDFIELDNAME: case SO_THIRDFIELDNAME: @@ -152,24 +138,11 @@ public class FilterComponent FieldColumn CurFieldColumn = new FieldColumn(oQueryMetaData, CurDisplayFieldName); String sControlNameTextValue = "txtValue" + sControlNameSuffix; -// String sControlNameBooleanList = "lstBoolean" + sControlNameSuffix; -// if (aFieldColumn.FieldType == DataType.BOOLEAN) -// { -// // scheint aufgrund eines Fehlers in Toolkit nicht zu funktionieren -// CurUnoDialog.setControlVisible(sControlNameTextValue, false); -// CurUnoDialog.setControlVisible(sControlNameBooleanList, true); -// } -// else -// { -// CurUnoDialog.setControlVisible(sControlNameTextValue, true); -// CurUnoDialog.setControlVisible(sControlNameBooleanList, false); - XControl xValueControl = CurUnoDialog.xDlgContainer.getControl(sControlNameTextValue); XInterface xValueModel = (XInterface) UnoDialog.getModel(xValueControl); Helper.setUnoPropertyValue(xValueModel, "TreatAsNumber", Boolean.valueOf(CurFieldColumn.isNumberFormat())); final NumberFormatter aNumberFormatter = oQueryMetaData.getNumberFormatter(); aNumberFormatter.setNumberFormat(xValueModel, CurFieldColumn.getDBFormatKey(), aNumberFormatter); -// } break; case SO_FIRSTCONDITION: @@ -180,7 +153,6 @@ public class FilterComponent break; case SOOPTORMODE: case SOOPTANDMODE: - // getfilterstate(); return; case SO_FIRSTBOOLFIELDNAME: @@ -210,24 +182,6 @@ public class FilterComponent togglefollowingControlRow(sName); } - public void disposing(EventObject EventObject) - { - } - } - - public void fieldconditionchanged(ItemEvent EventObject) - { - String sName = getControlName(EventObject.Source); - togglefollowingControlRow(sName); - } - - public void disposing(com.sun.star.lang.EventObject eventObject) - { - } - - class ActionListenerImpl implements com.sun.star.awt.XActionListener - { - public void disposing(EventObject eventObject) { } @@ -284,6 +238,7 @@ public class FilterComponent int nFilterCount = getFilterCount(); if (nFilterCount > 0) { + final SQLQueryComposer composer = oQueryMetaData.getSQLQueryComposer(); try { final String serviceName = "com.sun.star.beans.PropertyBag"; @@ -291,31 +246,32 @@ public class FilterComponent column.addProperty("Type", PropertyAttribute.BOUND, DataType.VARCHAR); column.addProperty("Name", PropertyAttribute.BOUND, ""); + column.addProperty("Value", (short)( PropertyAttribute.MAYBEVOID | PropertyAttribute.REMOVABLE ), null ); final XPropertySet columnSet = UnoRuntime.queryInterface(XPropertySet.class, column); - if ( oQueryMetaData.getSQLQueryComposer().getQuery().length() == 0) + if ( composer.getQuery().length() == 0) { - final String fromClause = oQueryMetaData.getSQLQueryComposer().getFromClause(); - StringBuffer sql = new StringBuffer(); - sql.append(oQueryMetaData.getSQLQueryComposer().getSelectClause(true)); + final String fromClause = composer.getFromClause(); + StringBuilder sql = new StringBuilder(); + sql.append(composer.getSelectClause(true)); sql.append(' '); sql.append(fromClause); - oQueryMetaData.getSQLQueryComposer().getQueryComposer().setElementaryQuery(sql.toString()); + composer.getQueryComposer().setElementaryQuery(sql.toString()); } - int a = 0; + composer.getQueryComposer().setStructuredFilter( new PropertyValue[][] {} ); for (int i = 0; i < RowCount; i++) { - ControlRow CurControlRow = oControlRows[i]; - if (CurControlRow.isEnabled()) + ControlRow currentControlRow = oControlRows[i]; + if (currentControlRow.isEnabled()) { - if (CurControlRow.isConditionComplete()) + if (currentControlRow.isConditionComplete()) { - String sFieldName = CurControlRow.getSelectedFieldName(); - int nOperator = (int) CurControlRow.getSelectedOperator(); + String sFieldName = currentControlRow.getSelectedFieldName(); + int nOperator = (int) currentControlRow.getSelectedOperator(); FieldColumn aFieldColumn = oQueryMetaData.getFieldColumnByDisplayName(sFieldName); columnSet.setPropertyValue("Name", aFieldColumn.getFieldName()); columnSet.setPropertyValue("Type", aFieldColumn.getXColumnPropertySet().getPropertyValue("Type")); - Object value = CurControlRow.getValue(); + Object value = currentControlRow.getValue(); switch(aFieldColumn.getFieldType()) { case DataType.TIMESTAMP: @@ -323,13 +279,24 @@ public class FilterComponent value = ((Double)value) - oQueryMetaData.getNullDateCorrection(); break; } - column.addProperty("Value", PropertyAttribute.MAYBEVOID, value); + column.removeProperty( "Value" ); + final short operator = currentControlRow.getSelectedOperator(); + if ( ( operator == SQLFilterOperator.SQLNULL ) + || ( operator == SQLFilterOperator.NOT_SQLNULL ) + || AnyConverter.isVoid( value ) + ) + { + column.addProperty("Value", (short)( PropertyAttribute.MAYBEVOID | PropertyAttribute.REMOVABLE ), new String() ); + value = new Any( new Type( TypeClass.VOID ), null ); + } + else + column.addProperty("Value", (short)( PropertyAttribute.MAYBEVOID | PropertyAttribute.REMOVABLE ), value ); columnSet.setPropertyValue("Value", value); - oQueryMetaData.getSQLQueryComposer().getQueryComposer().appendFilterByColumn(columnSet, getfilterstate() == this.SOI_MATCHALL,nOperator); + composer.getQueryComposer().appendFilterByColumn(columnSet, getfilterstate() == this.SOI_MATCHALL,nOperator); } } } - filterconditions = oQueryMetaData.getSQLQueryComposer().getQueryComposer().getStructuredFilter(); + filterconditions = composer.getNormalizedStructuredFilter(); int[] iduplicate = JavaTools.getDuplicateFieldIndex(filterconditions); if (iduplicate[0] != -1) { @@ -337,9 +304,7 @@ public class FilterComponent String smsgDuplicateCondition = getDisplayCondition(sDuplicateCondition, aduplicatecondition, null); CurUnoDialog.showMessageBox("WarningBox", VclWindowPeerAttribute.OK, smsgDuplicateCondition); CurUnoDialog.vetoableChange(new java.beans.PropertyChangeEvent(CurUnoDialog, "Steps", Integer.valueOf(1), Integer.valueOf(2))); - return new PropertyValue[][] - { - }; + return new PropertyValue[][]{}; } } catch (Exception ex) @@ -402,22 +367,6 @@ public class FilterComponent return ifilterstate; } - private void addfiltercondition(int _index, String _curFieldName, Object _curValue, int _curOperator) - { - String ValString = String.valueOf(_curValue); - PropertyValue oPropertyValue = Properties.createProperty(_curFieldName, ValString, _curOperator); - getfilterstate(); - if (getfilterstate() == this.SOI_MATCHALL) - { - if (_index == 0) - { - filterconditions[0] = new PropertyValue[getFilterCount()]; - } - filterconditions[0][_index] = new PropertyValue(); - filterconditions[0][_index] = oPropertyValue; - } - } - private int getFilterCount() { int a = 0; @@ -429,8 +378,6 @@ public class FilterComponent } } return a; - // FilterCount = a; - // return FilterCount; } /** Creates a new instance of FilterComponent @@ -456,8 +403,6 @@ public class FilterComponent this.oQueryMetaData = _oQueryMetaData; boolean bEnabled; sIncSuffix = com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(), "optMatchAll"); - // iStartPosX = iPosX; - // iStartPosY = iPosY; String soptMatchAll = CurUnoDialog.m_oResource.getResText(BaseID + 9); String soptMatchAny = CurUnoDialog.m_oResource.getResText(BaseID + 10); @@ -465,14 +410,13 @@ public class FilterComponent slblOperators = CurUnoDialog.m_oResource.getResText(BaseID + 24); slblValue = CurUnoDialog.m_oResource.getResText(BaseID + 25); sLogicOperators = CurUnoDialog.m_oResource.getResArray(BaseID + 26, 10 /* 7 */); // =, <>, <, >, <=, >=, like, !like, is null, !is null - sBooleanValues = CurUnoDialog.m_oResource.getResArray(BaseID + 36, 2); // true, false sDuplicateCondition = CurUnoDialog.m_oResource.getResText(BaseID + 89); // create Radiobuttons // * match all // * match one - optMatchAll = CurUnoDialog.insertRadioButton("optMatchAll" + sIncSuffix, SOOPTANDMODE, new ItemListenerImpl(), + CurUnoDialog.insertRadioButton("optMatchAll" + sIncSuffix, SOOPTANDMODE, new ItemListenerImpl(), new String[] { "Height", @@ -488,7 +432,7 @@ public class FilterComponent new Object[] { Integer.valueOf(9), - "HID:" + curHelpID++, + HelpIds.getHelpIdString(curHelpID++), soptMatchAll, Integer.valueOf(iPosX), Integer.valueOf(iPosY), @@ -512,7 +456,7 @@ public class FilterComponent new Object[] { Integer.valueOf(9), - "HID:" + curHelpID++, + HelpIds.getHelpIdString(curHelpID++), soptMatchAny, Integer.valueOf(iPosX), Integer.valueOf(iPosY + 12), @@ -533,13 +477,6 @@ public class FilterComponent public void initialize(PropertyValue[][] _filterconditions, String[] _fieldnames) { - // String aFieldNamesWithAdditionalEmpty[] = new String[_fieldnames.length + 1]; - // for (int i = 0; i < _fieldnames.length; i++) - // { - // aFieldNamesWithAdditionalEmpty[i] = _fieldnames[i]; - // } - // aFieldNamesWithAdditionalEmpty[_fieldnames.length] = ""; - int i; for (i = 0; i < RowCount; i++) { @@ -592,9 +529,8 @@ public class FilterComponent // // // ------------------------------------------------------------------------- - class ControlRow + final class ControlRow { - private final static int SOLSTFIELDNAME = 3; private final static int SOLSTOPERATOR = 4; private final static int SOTXTVALUE = 5; @@ -713,7 +649,7 @@ public class FilterComponent Boolean.valueOf(isEnabled()), Boolean.TRUE, Integer.valueOf(13), - "HID:" + _firstRowHelpID++, + HelpIds.getHelpIdString(_firstRowHelpID++), Short.valueOf(UnoDialog.getListBoxLineCount() /* 7 */), Integer.valueOf(nPosX1), Integer.valueOf(iCompPosY + 23), @@ -743,7 +679,7 @@ public class FilterComponent Boolean.valueOf(isEnabled()), Boolean.TRUE, Integer.valueOf(13), - "HID:" + _firstRowHelpID++, + HelpIds.getHelpIdString(_firstRowHelpID++), Short.valueOf((short) sLogicOperators.length /* 7 */), Integer.valueOf(nPosX2), Integer.valueOf(iCompPosY + 23), @@ -768,37 +704,13 @@ public class FilterComponent { Boolean.valueOf(isEnabled()), Integer.valueOf(13), - "HID:" + _firstRowHelpID++, + HelpIds.getHelpIdString(_firstRowHelpID++), Integer.valueOf(nPosX3), Integer.valueOf(iCompPosY + 23), IStep, Short.valueOf(curtabindex++), Integer.valueOf(nValueWidth) }); - -// ControlElements[6] = CurUnoDialog.insertListBox((new StringBuilder()).append("lstBoolean").append(sCompSuffix).toString(), SO_BOOLEANLIST[Index], null, new ItemListenerImpl(), new String[] { -// "Enabled", -// "Dropdown", -// "Height", -// "HelpURL", -// "LineCount", -// "PositionX", "PositionY", -// "Step", -// "StringItemList", -// "TabIndex", -// "Width" -// }, new Object[] { -// new Boolean(bEnabled), -// Boolean.TRUE, -// new Integer(13), -// "HID:" + _firstRowHelpID++, -// new Short((short) 2), -// new Integer(nPosX3 + 44), new Integer(iCompPosY + 23), -// IStep, -// FilterComponent.sBooleanValues, -// new Short(curtabindex++), -// new Integer(nValueWidth) -// }); } catch (Exception exception) { @@ -843,13 +755,6 @@ public class FilterComponent String sValue = (String.valueOf(oValue)); return (!sValue.equals("")); } -// String sBoolValue=""; -// short aSelectedBoolValue[] = (short[])Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[6]), "SelectedItems"); -// if (aSelectedBoolValue.length > 0) -// { -// sBoolValue = String.valueOf(aSelectedBoolValue[0] == 1); -// return !sBoolValue.equals(""); -// } } } return false; @@ -861,16 +766,10 @@ public class FilterComponent } } - private void fieldnamechanged(ItemEvent EventObject) - { - int i = 0; - } - protected void setCondition(PropertyValue _filtercondition) { try { - int ikey; XListBox xFieldsListBox = (XListBox) UnoRuntime.queryInterface(XListBox.class, ControlElements[SOLSTFIELDNAME]); xFieldsListBox.selectItem(_filtercondition.Name, true); XListBox xOperatorListBox = (XListBox) UnoRuntime.queryInterface(XListBox.class, ControlElements[SOLSTOPERATOR]); @@ -940,8 +839,8 @@ public class FilterComponent private void settovoid() { - CurUnoDialog.deselectListBox(ControlElements[SOLSTFIELDNAME]); - CurUnoDialog.deselectListBox(ControlElements[SOLSTOPERATOR]); + WizardDialog.deselectListBox(ControlElements[SOLSTFIELDNAME]); + WizardDialog.deselectListBox(ControlElements[SOLSTOPERATOR]); Helper.setUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue", com.sun.star.uno.Any.VOID); } @@ -976,7 +875,7 @@ public class FilterComponent } else if (!isConditionComplete()) { - CurUnoDialog.deselectListBox(ControlElements[SOLSTOPERATOR]); + WizardDialog.deselectListBox(ControlElements[SOLSTOPERATOR]); } } @@ -1047,43 +946,9 @@ public class FilterComponent protected String getDateTimeString(boolean bgetDate) { - double dblValue = ((Double) getValue()).doubleValue(); - NumberFormatter oNumberFormatter = oQueryMetaData.getNumberFormatter(); - return oNumberFormatter.convertNumberToString(iDateTimeFormat, dblValue); + double dblValue = ((Double) getValue()).doubleValue(); + NumberFormatter oNumberFormatter = oQueryMetaData.getNumberFormatter(); + return oNumberFormatter.convertNumberToString(iDateTimeFormat, dblValue); } } } -// com.sun.star.sdb.SQLFilterOperator.EQUAL -// com.sun.star.sdb.SQLFilterOperator.NOT_EQUAL -// com.sun.star.sdb.SQLFilterOperator.LESS -// com.sun.star.sdb.SQLFilterOperator.GREATER -// com.sun.star.sdb.SQLFilterOperator.LESS_EQUAL -// com.sun.star.sdb.SQLFilterOperator.GREATER_EQUAL -// com.sun.star.sdb.SQLFilterOperator.LIKE -// com.sun.star.sdb.SQLFilterOperator.NOT_LIKE -// com.sun.star.sdb.SQLFilterOperator.SQLNULL -// com.sun.star.sdb.SQLFilterOperator.NOT_SQLNULL - -/* constants SQLFilterOperator -{ -/// equal to -const long EQUAL = 1; -/// not equal to -const long NOT_EQUAL = 2; -/// less than -const long LESS = 3; -/// greater than -const long GREATER = 4; -/// less or eqal than -const long LESS_EQUAL = 5; -/// greater or eqal than -const long GREATER_EQUAL = 6; -/// like -const long LIKE = 7; -/// not like -const long NOT_LIKE = 8; -/// is null -const long SQLNULL = 9; -/// is not null -const long NOT_SQLNULL = 10; -}; */ diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java index 0fb4a4e93..2e1db6a7c 100644 --- a/wizards/com/sun/star/wizards/ui/ImageList.java +++ b/wizards/com/sun/star/wizards/ui/ImageList.java @@ -43,6 +43,7 @@ import com.sun.star.awt.XWindow; import com.sun.star.lang.EventObject; import com.sun.star.uno.UnoRuntime; import com.sun.star.wizards.common.Helper; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.common.IRenderer; import com.sun.star.wizards.ui.event.*; @@ -255,7 +256,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener btnBack = dialog.insertButton(name + "_btnBack", "prevPage", this, pNames1, new Object[] { btnSize, - "HID:" + helpURL++, + HelpIds.getHelpIdString(helpURL++), new Integer(pos.Width), new Integer(pos.Height + (imageSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1), step, @@ -267,7 +268,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener btnNext = dialog.insertButton(name + "_btnNext", "nextPage", this, pNames1, new Object[] { btnSize, - "HID:" + helpURL++, + HelpIds.getHelpIdString(helpURL++), new Integer(pos.Width + (imageSize.Width + gap.Width) * cols + gap.Width - btnSize.intValue() + 1), new Integer(pos.Height + (imageSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1), step, @@ -354,7 +355,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener NO_BORDER, BACKGROUND_COLOR, m_imageHeight, - "HID:" + helpURL++, + HelpIds.getHelpIdString(helpURL++), new Integer(getImagePosX(_col)), new Integer(getImagePosY(_row)), scaleImages, diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java index 3e4b45c2c..4334974e9 100644 --- a/wizards/com/sun/star/wizards/ui/SortingComponent.java +++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java @@ -105,7 +105,7 @@ public class SortingComponent new Boolean(bDoEnable), new Integer(8), sSortHeader[i], new Integer(0), ICompPosX, new Integer(iCurPosY), IStep, new Short(curtabindex++), ICompWidth }); - HIDString = "HID:" + Integer.toString(FirstHelpIndex); + HIDString = HelpIds.getHelpIdString(FirstHelpIndex); xSortListBox[i] = CurUnoDialog.insertListBox("lstSort" + new Integer(i + 1).toString(), SOSORTLST[i], null, new ItemListenerImpl(), new String[] { "Dropdown", "Enabled", "Height", "HelpURL", "LineCount", "Name", "PositionX", "PositionY", "Step", "TabIndex", "Width" @@ -114,7 +114,7 @@ public class SortingComponent new Boolean(true), new Boolean(bDoEnable), new Integer(12), HIDString, new Short(UnoDialog.getListBoxLineCount()), "lstSort" + new Integer(i + 1), IListBoxPosX, new Integer(iCurPosY + 14), IStep, new Short(curtabindex++), IListBoxWidth }); //new Short((short) (17+i*4)) - HIDString = "HID:" + Integer.toString(FirstHelpIndex + 1); + HIDString = HelpIds.getHelpIdString(FirstHelpIndex + 1); XRadioButton xRadioButtonAsc = CurUnoDialog.insertRadioButton("optAscend" + Integer.toString(i + 1), 0, new String[] { "Enabled", "Height", "HelpURL", "Label", "PositionX", "PositionY", "State", "Step", "TabIndex", "Tag", "Width" @@ -123,7 +123,7 @@ public class SortingComponent new Boolean(bDoEnable), new Integer(10), HIDString, sSortAscend[i], IOptButtonPosX, new Integer(iCurPosY + 10), new Short((short) 1), IStep, new Short(curtabindex++), new String("ASC"), IOptButtonWidth }); //, new Short((short) (18+i*4)) - HIDString = "HID:" + Integer.toString(FirstHelpIndex + 2); + HIDString = HelpIds.getHelpIdString(FirstHelpIndex + 2); XRadioButton xRadioButtonDesc = CurUnoDialog.insertRadioButton("optDescend" + Integer.toString(i + 1), 0, new String[] { "Enabled", "Height", "HelpURL", "Label", "PositionX", "PositionY", "State", "Step", "TabIndex", "Tag", "Width" diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java index f42dac35a..bc6d1d4ac 100644 --- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java +++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java @@ -121,7 +121,7 @@ public class TitlesComponent extends ControlScroller }, new Object[] { - new Integer(12), "HID:" + curHelpIndex++, new Integer(iLabelPosX + 30), new Integer(_iCompPosY), UIConsts.INVISIBLESTEP, new Short(curtabindex++), new Integer(iCompWidth - 90 - 20) + new Integer(12), HelpIds.getHelpIdString(curHelpIndex++), new Integer(iLabelPosX + 30), new Integer(_iCompPosY), UIConsts.INVISIBLESTEP, new Short(curtabindex++), new Integer(iCompWidth - 90 - 20) }); } } diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index 5a8434148..b7f7d98ba 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -32,7 +32,6 @@ import com.sun.star.wizards.ui.event.CommonListener; import com.sun.star.wizards.ui.event.EventNames; import com.sun.star.wizards.ui.event.MethodInvocation; import com.sun.star.uno.UnoRuntime; -// import com.sun.star.awt.XItemEventBroadcaster; import com.sun.star.awt.*; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.XInterface; @@ -47,6 +46,7 @@ import com.sun.star.frame.XTerminateListener; import com.sun.star.frame.TerminationVetoException; import com.sun.star.lang.IllegalArgumentException; import com.sun.star.beans.*; +import com.sun.star.wizards.common.HelpIds; public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeListener, XTerminateListener, XCompletion { @@ -488,7 +488,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL "Enabled", "Height", "HelpURL", "Label", "PositionX", "PositionY", "PushButtonType", "Step", "TabIndex", "Width" }; - Helper.setUnoPropertyValue(super.xDialogModel, "HelpURL", "HID:" + hid); + Helper.setUnoPropertyValue(super.xDialogModel, "HelpURL", HelpIds.getHelpIdString(hid)); insertButton("btnWizardHelp", HELP_ACTION_PERFORMED, new String[] { "Enabled", "Height", "Label", "PositionX", "PositionY", "PushButtonType", "Step", "TabIndex", "Width" @@ -500,25 +500,25 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL insertButton("btnWizardBack", BACK_ACTION_PERFORMED, propNames, new Object[] { - new Boolean(false), IButtonHeight, "HID:" + (hid + 2), oWizardResource.getResText(UIConsts.RID_COMMON + 13), new Integer(iBackPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth + new Boolean(false), IButtonHeight, HelpIds.getHelpIdString(hid + 2), oWizardResource.getResText(UIConsts.RID_COMMON + 13), new Integer(iBackPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth }); insertButton("btnWizardNext", NEXT_ACTION_PERFORMED, propNames, new Object[] { - new Boolean(true), IButtonHeight, "HID:" + (hid + 3), oWizardResource.getResText(UIConsts.RID_COMMON + 14), new Integer(iNextPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth + new Boolean(true), IButtonHeight, HelpIds.getHelpIdString(hid + 3), oWizardResource.getResText(UIConsts.RID_COMMON + 14), new Integer(iNextPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth }); insertButton("btnWizardFinish", FINISH_ACTION_PERFORMED, propNames, new Object[] { - new Boolean(true), IButtonHeight, "HID:" + (hid + 4), oWizardResource.getResText(UIConsts.RID_COMMON + 12), new Integer(iFinishPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth + new Boolean(true), IButtonHeight, HelpIds.getHelpIdString(hid + 4), oWizardResource.getResText(UIConsts.RID_COMMON + 12), new Integer(iFinishPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth }); insertButton("btnWizardCancel", CANCEL_ACTION_PERFORMED, propNames, new Object[] { - new Boolean(true), IButtonHeight, "HID:" + (hid + 5), oWizardResource.getResText(UIConsts.RID_COMMON + 11), new Integer(iCancelPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth + new Boolean(true), IButtonHeight, HelpIds.getHelpIdString(hid + 5), oWizardResource.getResText(UIConsts.RID_COMMON + 11), new Integer(iCancelPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth }); setControlProperty("btnWizardNext", "DefaultButton", Boolean.TRUE); diff --git a/wizards/com/sun/star/wizards/web/CallWizard.java b/wizards/com/sun/star/wizards/web/CallWizard.java index 4b9d7a368..1d18149e9 100644 --- a/wizards/com/sun/star/wizards/web/CallWizard.java +++ b/wizards/com/sun/star/wizards/web/CallWizard.java @@ -42,8 +42,7 @@ import com.sun.star.wizards.common.Resource; /** * This class capsulates the class, that implements the minimal component, a factory for - * creating the service (<CODE>__getServiceFactory</CODE>) and a method, that writes the - * information into the given registry key (<CODE>__writeRegistryServiceInfo</CODE>). + * creating the service (<CODE>__getServiceFactory</CODE>). * * @author rpiterman * @version $Revision: 1.10.52.1 $ @@ -79,22 +78,6 @@ public class CallWizard } /** - * Writes the service information into the given registry key. This method is called - * by the <code>JavaLoader</code>. - * - * @param xregistrykey Makes structural information (except regarding tree - * structures) of a single registry key accessible. - * - * @return returns true if the operation succeeded - * - * @see com.sun.star.comp.loader.JavaLoader# - */ - public static boolean __writeRegistryServiceInfo(XRegistryKey xregistrykey) - { - return FactoryHelper.writeRegistryServiceInfo(WizardImplementation.class.getName(), WizardImplementation.__serviceName, xregistrykey); - } - - /** * This class implements the component. At least the interfaces XServiceInfo, * XTypeProvider, and XInitialization should be provided by the service. */ diff --git a/wizards/com/sun/star/wizards/web/FTPDialog.java b/wizards/com/sun/star/wizards/web/FTPDialog.java index fc11e1779..4d7d6571e 100644 --- a/wizards/com/sun/star/wizards/web/FTPDialog.java +++ b/wizards/com/sun/star/wizards/web/FTPDialog.java @@ -53,6 +53,7 @@ import com.sun.star.wizards.ui.event.DataAware; import com.sun.star.wizards.ui.event.UnoDataAware; import com.sun.star.wizards.web.data.CGPublish; import com.sun.star.wizards.web.data.CGSettings; +import com.sun.star.wizards.common.HelpIds; /** * This is the FTP Dialog. <br/> @@ -200,7 +201,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID }, new Object[] { - Boolean.TRUE, new Integer(160), "HID:" + HID_FTP, Boolean.TRUE, "FTPDialog", new Integer(167), new Integer(82), resources.resFTPDialog_title, new Integer(222) + Boolean.TRUE, new Integer(160), HelpIds.getHelpIdString(HID_FTP), Boolean.TRUE, "FTPDialog", new Integer(167), new Integer(82), resources.resFTPDialog_title, new Integer(222) }); //add controls to dialog @@ -248,7 +249,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID }, new Object[] { - INTEGER_12, "HID:" + HID_FTP_SERVER, "txtIP", new Integer(110), new Integer(18), new Short((short) 2), new Integer(106) + INTEGER_12, HelpIds.getHelpIdString(HID_FTP_SERVER), "txtIP", new Integer(110), new Integer(18), new Short((short) 2), new Integer(106) }); lblUsername = insertLabel("lblUsername", PROPNAMES_LABEL, @@ -263,7 +264,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID }, new Object[] { - INTEGER_12, "HID:" + HID_FTP_USERNAME, "txtUsername", new Integer(110), new Integer(34), new Short((short) 4), new Integer(106) + INTEGER_12, HelpIds.getHelpIdString(HID_FTP_USERNAME), "txtUsername", new Integer(110), new Integer(34), new Short((short) 4), new Integer(106) }); lblPassword = insertLabel("lblPassword", PROPNAMES_LABEL, @@ -278,7 +279,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID }, new Object[] { - new Short((short) 42), INTEGER_12, "HID:" + HID_FTP_PASS, "txtPassword", new Integer(110), new Integer(50), new Short((short) 6), new Integer(106) + new Short((short) 42), INTEGER_12, HelpIds.getHelpIdString(HID_FTP_PASS), "txtPassword", new Integer(110), new Integer(50), new Short((short) 6), new Integer(106) }); ln2 = insertFixedLine("ln2", PROPNAMES_LABEL, @@ -290,7 +291,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID_FTP_TEST, resources.resbtnConnect_value, "btnConnect", INTEGER_12, new Integer(80), new Short((short) 8), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID_FTP_TEST), resources.resbtnConnect_value, "btnConnect", INTEGER_12, new Integer(80), new Short((short) 8), INTEGER_50 }); imgStatus = insertImage("imgStatus", @@ -324,27 +325,27 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID }, new Object[] { - new Boolean(false), INTEGER_12, "HID:" + HID_FTP_TXT_PATH, "txtDir", INTEGER_12, new Integer(113), new Short((short) 11), resources.restxtDir_value, new Integer(184) + new Boolean(false), INTEGER_12, HelpIds.getHelpIdString(HID_FTP_TXT_PATH), "txtDir", INTEGER_12, new Integer(113), new Short((short) 11), resources.restxtDir_value, new Integer(184) }); btnDir = insertButton("btnDir", "chooseDirectory", PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID_FTP_BTN_PATH, resources.resbtnDir_value, "btnDir", new Integer(199), new Integer(112), new Short((short) 12), INTEGER_16 + INTEGER_14, HelpIds.getHelpIdString(HID_FTP_BTN_PATH), resources.resbtnDir_value, "btnDir", new Integer(199), new Integer(112), new Short((short) 12), INTEGER_16 }); btnOK = insertButton("btnOK", null, PROPNAMES_BUTTON2, new Object[] { - INTEGER_14, "HID:" + HID_FTP_OK, resources.resbtnOK_value, "btnOK", new Integer(165), new Integer(142), new Short((short) PushButtonType.OK_value), new Short((short) 13), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID_FTP_OK), resources.resbtnOK_value, "btnOK", new Integer(165), new Integer(142), new Short((short) PushButtonType.OK_value), new Short((short) 13), INTEGER_50 }); btnCancel = insertButton("btnCancel", null, PROPNAMES_BUTTON2, new Object[] { - INTEGER_14, "HID:" + HID_FTP_CANCEL, resources.resbtnCancel_value, "btnCancel", new Integer(113), new Integer(142), new Short((short) PushButtonType.CANCEL_value), new Short((short) 14), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID_FTP_CANCEL), resources.resbtnCancel_value, "btnCancel", new Integer(113), new Integer(142), new Short((short) PushButtonType.CANCEL_value), new Short((short) 14), INTEGER_50 }); btnHelp = insertButton("btnHelp", null, diff --git a/wizards/com/sun/star/wizards/web/ImageListDialog.java b/wizards/com/sun/star/wizards/web/ImageListDialog.java index a31f8ed73..89fb46e4b 100644 --- a/wizards/com/sun/star/wizards/web/ImageListDialog.java +++ b/wizards/com/sun/star/wizards/web/ImageListDialog.java @@ -32,6 +32,7 @@ import com.sun.star.awt.XButton; import com.sun.star.awt.XFixedText; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.wizards.common.Helper; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.common.JavaTools; import com.sun.star.wizards.common.IRenderer; import com.sun.star.wizards.ui.ImageList; @@ -135,7 +136,7 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts }, new Object[] { - Boolean.TRUE, new Integer(dialogHeight), "HID:" + hid, Boolean.TRUE, "imgDialog", new Integer(59), new Integer(24), INTEGERS[1], resources[RES_TITLE], new Integer(dialogWidth) + Boolean.TRUE, new Integer(dialogHeight), HelpIds.getHelpIdString(hid), Boolean.TRUE, "imgDialog", new Integer(59), new Integer(24), INTEGERS[1], resources[RES_TITLE], new Integer(dialogWidth) }); //Set member- FontDescriptors... fontDescriptor1.Weight = 150; @@ -151,13 +152,13 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts PROPNAMES, new Object[] { - Boolean.TRUE, INTEGER_14, "HID:" + (hid + 3), resources[RES_OK], "btnOK", iButtonsX, new Integer(22), new Short((short) com.sun.star.awt.PushButtonType.OK_value), new Short((short) 7), INTEGER_50 + Boolean.TRUE, INTEGER_14, HelpIds.getHelpIdString(hid + 3), resources[RES_OK], "btnOK", iButtonsX, new Integer(22), new Short((short) com.sun.star.awt.PushButtonType.OK_value), new Short((short) 7), INTEGER_50 }); btnCancel = insertButton("btnCancel", null, PROPNAMES, new Object[] { - Boolean.FALSE, INTEGER_14, "HID:" + (hid + 4), resources[RES_CANCEL], "btnCancel", iButtonsX, new Integer(41), new Short((short) com.sun.star.awt.PushButtonType.CANCEL_value), new Short((short) 8), INTEGER_50 + Boolean.FALSE, INTEGER_14, HelpIds.getHelpIdString(hid + 4), resources[RES_CANCEL], "btnCancel", iButtonsX, new Integer(41), new Short((short) com.sun.star.awt.PushButtonType.CANCEL_value), new Short((short) 8), INTEGER_50 }); btnHelp = insertButton("btnHelp", null, PROPNAMES, @@ -175,7 +176,7 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts PROPNAMES, new Object[] { - Boolean.FALSE, INTEGER_14, "HID:" + (hid + 1), resources[RES_OTHER], "btnOther", iButtonsX, new Integer(otherY), new Short((short) com.sun.star.awt.PushButtonType.STANDARD_value), new Short((short) 5), INTEGER_50 + Boolean.FALSE, INTEGER_14, HelpIds.getHelpIdString(hid + 1), resources[RES_OTHER], "btnOther", iButtonsX, new Integer(otherY), new Short((short) com.sun.star.awt.PushButtonType.STANDARD_value), new Short((short) 5), INTEGER_50 }); } @@ -188,7 +189,7 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts PROPNAMES, new Object[] { - Boolean.FALSE, INTEGER_14, "HID:" + (hid + 2), resources[RES_DESELECT], "btnNoImage", iButtonsX, new Integer(deselectY), new Short((short) com.sun.star.awt.PushButtonType.STANDARD_value), new Short((short) 4), INTEGER_50 + Boolean.FALSE, INTEGER_14, HelpIds.getHelpIdString(hid + 2), resources[RES_DESELECT], "btnNoImage", iButtonsX, new Integer(deselectY), new Short((short) com.sun.star.awt.PushButtonType.STANDARD_value), new Short((short) 4), INTEGER_50 }); } diff --git a/wizards/com/sun/star/wizards/web/WWD_General.java b/wizards/com/sun/star/wizards/web/WWD_General.java index 4617a10ba..c9b060772 100644 --- a/wizards/com/sun/star/wizards/web/WWD_General.java +++ b/wizards/com/sun/star/wizards/web/WWD_General.java @@ -31,6 +31,7 @@ import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.util.XStringSubstitution; import com.sun.star.wizards.common.FileAccess; import com.sun.star.wizards.common.Helper; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.common.JavaTools; import com.sun.star.wizards.common.SystemDialog; import com.sun.star.wizards.ui.event.ListModelBinder; @@ -63,7 +64,7 @@ public abstract class WWD_General extends WebWizardDialog StatusDialog statusDialog = new StatusDialog(xMSF, StatusDialog.STANDARD_WIDTH, resources.resLoadingSession, false, new String[] { resources.prodName, "", "", "", "", "" - }, "HID:" + HID0_STATUS_DIALOG); + }, HelpIds.getHelpIdString(HID0_STATUS_DIALOG)); try { statusDialog.createWindowPeer(xControl.getPeer()); diff --git a/wizards/com/sun/star/wizards/web/WebWizardDialog.java b/wizards/com/sun/star/wizards/web/WebWizardDialog.java index a65132714..e32778cfa 100644 --- a/wizards/com/sun/star/wizards/web/WebWizardDialog.java +++ b/wizards/com/sun/star/wizards/web/WebWizardDialog.java @@ -39,6 +39,7 @@ import com.sun.star.awt.XRadioButton; import com.sun.star.awt.XTextComponent; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.wizards.common.Helper; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.ui.ImageList; import com.sun.star.wizards.ui.UIConsts; import com.sun.star.wizards.ui.WizardDialog; @@ -221,7 +222,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - Boolean.TRUE, new Integer(210), "HID:" + HID0_WEBWIZARD, Boolean.TRUE, "WebWizardDialog", new Integer(102), new Integer(52), INTEGERS[1], new Short((short) 6), resources.resWebWizardDialog_title, new Integer(330) + Boolean.TRUE, new Integer(210), HelpIds.getHelpIdString(HID0_WEBWIZARD), Boolean.TRUE, "WebWizardDialog", new Integer(102), new Integer(52), INTEGERS[1], new Short((short) 6), resources.resWebWizardDialog_title, new Integer(330) }); //Set member- FontDescriptors... @@ -286,7 +287,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + HID1_LST_SESSIONS, new Short((short) 14), "lstLoadSettings", new Integer(97), new Integer(165), INTEGERS[1], new Short(tabIndex++), new Integer(173) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID1_LST_SESSIONS), new Short((short) 14), "lstLoadSettings", new Integer(97), new Integer(165), INTEGERS[1], new Short(tabIndex++), new Integer(173) }); btnDelSession = insertButton("btnDelSession", BTNDELSESSION_ACTION_PERFORMED, new String[] @@ -295,7 +296,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - Boolean.FALSE, INTEGER_14, "HID:" + HID1_BTN_DEL_SES, new Short(com.sun.star.awt.ImageAlign.LEFT), resources.resbtnDelSession_value, "btnDelSession", new Integer(274), new Integer(164), INTEGERS[1], new Short(tabIndex++), INTEGER_50 + Boolean.FALSE, INTEGER_14, HelpIds.getHelpIdString(HID1_BTN_DEL_SES), new Short(com.sun.star.awt.ImageAlign.LEFT), resources.resbtnDelSession_value, "btnDelSession", new Integer(274), new Integer(164), INTEGERS[1], new Short(tabIndex++), INTEGER_50 }); } @@ -322,19 +323,19 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - new Integer(123), "HID:" + HID2_LST_DOCS, new Short((short) 9), "lstDocuments", new Integer(97), new Integer(38), INTEGERS[2], new Short(tabIndex++), new Integer(103) + new Integer(123), HelpIds.getHelpIdString(HID2_LST_DOCS), new Short((short) 9), "lstDocuments", new Integer(97), new Integer(38), INTEGERS[2], new Short(tabIndex++), new Integer(103) }); btnAddDoc = insertButton("btnAddDoc", BTNADDDOC_ACTION_PERFORMED, PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID2_BTN_ADD_DOC, resources.resbtnAddDoc_value, "btnAddDoc", new Integer(97), new Integer(165), INTEGERS[2], new Short(tabIndex++), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID2_BTN_ADD_DOC), resources.resbtnAddDoc_value, "btnAddDoc", new Integer(97), new Integer(165), INTEGERS[2], new Short(tabIndex++), INTEGER_50 }); btnRemoveDoc = insertButton("btnRemoveDoc", BTNREMOVEDOC_ACTION_PERFORMED, PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID2_BTN_REM_DOC, resources.resbtnRemoveDoc_value, "btnRemoveDoc", new Integer(150), new Integer(165), INTEGERS[2], new Short(tabIndex++), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID2_BTN_REM_DOC), resources.resbtnRemoveDoc_value, "btnRemoveDoc", new Integer(150), new Integer(165), INTEGERS[2], new Short(tabIndex++), INTEGER_50 }); btnDocUp = insertButton("btnDocUp", BTNDOCUP_ACTION_PERFORMED, new String[] @@ -343,7 +344,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - fontDescriptor7, INTEGER_14, "HID:" + HID2_BTN_DOC_UP, resources.resbtnDocUp_value, "btnDocUp", new Integer(205), new Integer(87), INTEGERS[2], new Short(tabIndex++), new Integer(18) + fontDescriptor7, INTEGER_14, HelpIds.getHelpIdString(HID2_BTN_DOC_UP), resources.resbtnDocUp_value, "btnDocUp", new Integer(205), new Integer(87), INTEGERS[2], new Short(tabIndex++), new Integer(18) }); btnDocDown = insertButton("btnDocDown", BTNDOCDOWN_ACTION_PERFORMED, new String[] @@ -352,7 +353,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - fontDescriptor7, INTEGER_14, "HID:" + HID2_BTN_DOC_DOWN, resources.resbtnDocDown_value, "btnDocDown", new Integer(205), new Integer(105), INTEGERS[2], new Short(tabIndex++), new Integer(18) + fontDescriptor7, INTEGER_14, HelpIds.getHelpIdString(HID2_BTN_DOC_DOWN), resources.resbtnDocDown_value, "btnDocDown", new Integer(205), new Integer(105), INTEGERS[2], new Short(tabIndex++), new Integer(18) }); lblDocExportFormat = insertLabel("lblDocExportFormat", @@ -368,7 +369,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + HID2_LST_DOC_EXPORT, new Short((short) 14), "lstDocTargetType", new Integer(235), new Integer(38), INTEGERS[2], new Short(tabIndex++), new Integer(89) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID2_LST_DOC_EXPORT), new Short((short) 14), "lstDocTargetType", new Integer(235), new Integer(38), INTEGERS[2], new Short(tabIndex++), new Integer(89) }); @@ -390,7 +391,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_TXT, new Object[] { - INTEGER_12, "HID:" + HID2_TXT_DOC_TITLE, "txtDocTitle", new Integer(235), new Integer(88), INTEGERS[2], new Short(tabIndex++), new Integer(89) + INTEGER_12, HelpIds.getHelpIdString(HID2_TXT_DOC_TITLE), "txtDocTitle", new Integer(235), new Integer(88), INTEGERS[2], new Short(tabIndex++), new Integer(89) }); lblDocInfo = insertLabel("lblDocInfo", PROPNAMES_LBL, @@ -405,7 +406,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - INTEGER_40, "HID:" + HID2_TXT_DOC_DESC, Boolean.TRUE, "txtDocInfo", new Integer(235), new Integer(113), INTEGERS[2], new Short(tabIndex++), new Integer(89) + INTEGER_40, HelpIds.getHelpIdString(HID2_TXT_DOC_DESC), Boolean.TRUE, "txtDocInfo", new Integer(235), new Integer(113), INTEGERS[2], new Short(tabIndex++), new Integer(89) }); lblDocAuthor = insertLabel("lblDocAuthor", PROPNAMES_LBL, @@ -417,7 +418,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_TXT, new Object[] { - INTEGER_12, "HID:" + HID2_TXT_DOC_AUTHOR, "txtDocAuthor", new Integer(235), new Integer(165), INTEGERS[2], new Short(tabIndex++), new Integer(89) + INTEGER_12, HelpIds.getHelpIdString(HID2_TXT_DOC_AUTHOR), "txtDocAuthor", new Integer(235), new Integer(165), INTEGERS[2], new Short(tabIndex++), new Integer(89) }); } @@ -459,56 +460,56 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_FILENAME, resources.reschkDocFilename_value, "chkDocFilename", new Integer(103), new Integer(50), new Short((short) 0), INTEGERS[4], new Short((short) 35), new Integer(99) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_FILENAME), resources.reschkDocFilename_value, "chkDocFilename", new Integer(103), new Integer(50), new Short((short) 0), INTEGERS[4], new Short((short) 35), new Integer(99) }); chbDocDesc = insertCheckBox("chbDocDesc", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_DESCRIPTION, resources.reschbDocDesc_value, "chbDocDesc", new Integer(103), new Integer(60), new Short((short) 0), INTEGERS[4], new Short((short) 36), new Integer(99) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_DESCRIPTION), resources.reschbDocDesc_value, "chbDocDesc", new Integer(103), new Integer(60), new Short((short) 0), INTEGERS[4], new Short((short) 36), new Integer(99) }); chbDocAuthor = insertCheckBox("chbDocAuthor", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_AUTHOR, resources.reschbDocAuthor_value, "chbDocAuthor", new Integer(103), new Integer(70), new Short((short) 0), INTEGERS[4], new Short((short) 37), new Integer(99) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_AUTHOR), resources.reschbDocAuthor_value, "chbDocAuthor", new Integer(103), new Integer(70), new Short((short) 0), INTEGERS[4], new Short((short) 37), new Integer(99) }); chkDocCreated = insertCheckBox("chkDocCreated", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_CR_DATE, resources.reschkDocCreated_value, "chkDocCreated", new Integer(103), new Integer(80), new Short((short) 0), INTEGERS[4], new Short((short) 38), new Integer(99) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_CR_DATE), resources.reschkDocCreated_value, "chkDocCreated", new Integer(103), new Integer(80), new Short((short) 0), INTEGERS[4], new Short((short) 38), new Integer(99) }); chkDocChanged = insertCheckBox("chkDocChanged", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_UP_DATE, resources.reschkDocChanged_value, "chkDocChanged", new Integer(103), new Integer(90), new Short((short) 0), INTEGERS[4], new Short((short) 39), new Integer(99) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_UP_DATE), resources.reschkDocChanged_value, "chkDocChanged", new Integer(103), new Integer(90), new Short((short) 0), INTEGERS[4], new Short((short) 39), new Integer(99) }); chkDocFormat = insertCheckBox("chkDocFormat", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_FORMAT, resources.reschkDocFormat_value, "chkDocFormat", new Integer(200), new Integer(50), new Short((short) 0), INTEGERS[4], new Short((short) 40), new Integer(110) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_FORMAT), resources.reschkDocFormat_value, "chkDocFormat", new Integer(200), new Integer(50), new Short((short) 0), INTEGERS[4], new Short((short) 40), new Integer(110) }); chkDocFormatIcon = insertCheckBox("chkDocFormatIcon", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_F_ICON, resources.reschkDocFormatIcon_value, "chkDocFormatIcon", new Integer(200), new Integer(60), new Short((short) 0), INTEGERS[4], new Short((short) 41), new Integer(110) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_F_ICON), resources.reschkDocFormatIcon_value, "chkDocFormatIcon", new Integer(200), new Integer(60), new Short((short) 0), INTEGERS[4], new Short((short) 41), new Integer(110) }); chkDocPages = insertCheckBox("chkDocPages", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_PAGES, resources.reschkDocPages_value, "chkDocPages", new Integer(200), new Integer(70), new Short((short) 0), INTEGERS[4], new Short((short) 42), new Integer(110) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_PAGES), resources.reschkDocPages_value, "chkDocPages", new Integer(200), new Integer(70), new Short((short) 0), INTEGERS[4], new Short((short) 42), new Integer(110) }); chkDocSize = insertCheckBox("chkDocSize", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_SIZE, resources.reschkDocSize_value, "chkDocSize", new Integer(200), new Integer(80), new Short((short) 0), INTEGERS[4], new Short((short) 43), new Integer(110) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_SIZE), resources.reschkDocSize_value, "chkDocSize", new Integer(200), new Integer(80), new Short((short) 0), INTEGERS[4], new Short((short) 43), new Integer(110) }); lblOptimizeFor = insertLabel("lblOptimizeFor", PROPNAMES_LBL, @@ -520,19 +521,19 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_BUTTON, new Object[] { - INTEGERS[10], "HID:" + HID4_GRP_OPTIMAIZE_640, resources.resoptOptimize640x480_value, "optOptimize640x480", new Integer(103), new Integer(133), INTEGERS[4], new Short((short) 45), new Integer(44) + INTEGERS[10], HelpIds.getHelpIdString(HID4_GRP_OPTIMAIZE_640), resources.resoptOptimize640x480_value, "optOptimize640x480", new Integer(103), new Integer(133), INTEGERS[4], new Short((short) 45), new Integer(44) }); optOptimize800x600 = insertRadioButton("optOptimize800x600", null, PROPNAMES_BUTTON, new Object[] { - INTEGERS[10], "HID:" + HID4_GRP_OPTIMAIZE_800, resources.resoptOptimize800x600_value, "optOptimize800x600", new Integer(103), new Integer(146), INTEGERS[4], new Short((short) 46), new Integer(44) + INTEGERS[10], HelpIds.getHelpIdString(HID4_GRP_OPTIMAIZE_800), resources.resoptOptimize800x600_value, "optOptimize800x600", new Integer(103), new Integer(146), INTEGERS[4], new Short((short) 46), new Integer(44) }); optOptimize1024x768 = insertRadioButton("optOptimize1024x768", null, PROPNAMES_BUTTON, new Object[] { - INTEGERS[10], "HID:" + HID4_GRP_OPTIMAIZE_1024, resources.resoptOptimize1024x768_value, "optOptimize1024x768", new Integer(103), new Integer(158), INTEGERS[4], new Short((short) 47), new Integer(44) + INTEGERS[10], HelpIds.getHelpIdString(HID4_GRP_OPTIMAIZE_1024), resources.resoptOptimize1024x768_value, "optOptimize1024x768", new Integer(103), new Integer(158), INTEGERS[4], new Short((short) 47), new Integer(44) }); } @@ -557,7 +558,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + HID5_LST_STYLES, new Short((short) 14), "lstStyles", new Integer(179), new Integer(26), INTEGERS[5], new Short((short) 52), new Integer(145) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID5_LST_STYLES), new Short((short) 14), "lstStyles", new Integer(179), new Integer(26), INTEGERS[5], new Short((short) 52), new Integer(145) }); insertLabel("lblBackground", PROPNAMES_LBL, @@ -577,7 +578,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC btnBackgrounds = insertButton("btnBackgrounds", BTNBACKGROUNDS_ACTION_PERFORMED, PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID5_BTN_BACKGND, resources.resBtnChooseBackground, "btnBackgrounds", new Integer(274), new Integer(43), INTEGERS[5], new Short((short) 53), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID5_BTN_BACKGND), resources.resBtnChooseBackground, "btnBackgrounds", new Integer(274), new Integer(43), INTEGERS[5], new Short((short) 53), INTEGER_50 }); insertLabel("lblIconset", PROPNAMES_LBL, @@ -598,7 +599,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID5_BTN_ICONS, resources.resBtnChooseIconset, "btnIconSets", new Integer(274), new Integer(61), INTEGERS[5], new Short((short) 54), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID5_BTN_ICONS), resources.resBtnChooseIconset, "btnIconSets", new Integer(274), new Integer(61), INTEGERS[5], new Short((short) 54), INTEGER_50 }); insertLabel("lblIconsetInfo", new String[] @@ -642,7 +643,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_TXT, new Object[] { - INTEGER_12, "HID:" + HID6_TXT_SITE_TITLE, "txtSiteTitle", new Integer(179), new Integer(26), INTEGERS[6], new Short(tabIndex++), new Integer(145) + INTEGER_12, HelpIds.getHelpIdString(HID6_TXT_SITE_TITLE), "txtSiteTitle", new Integer(179), new Integer(26), INTEGERS[6], new Short(tabIndex++), new Integer(145) }); @@ -664,7 +665,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_TXT, new Object[] { - INTEGER_12, "HID:" + HID6_TXT_SITE_DESC, "txtSiteDesc", new Integer(179), new Integer(70), INTEGERS[6], new Short(tabIndex++), new Integer(145) + INTEGER_12, HelpIds.getHelpIdString(HID6_TXT_SITE_DESC), "txtSiteDesc", new Integer(179), new Integer(70), INTEGERS[6], new Short(tabIndex++), new Integer(145) }); lblEmail = insertLabel("lblEmail", PROPNAMES_LBL, @@ -675,7 +676,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC txtEmail = insertTextField("txtEmail", null, PROPNAMES_TXT, new Object[] { - INTEGER_12, "HID:" + HID6_TXT_SITE_EMAIL, "txtEmail", new Integer(179), new Integer(87), INTEGERS[6], new Short(tabIndex++), new Integer(145) + INTEGER_12, HelpIds.getHelpIdString(HID6_TXT_SITE_EMAIL), "txtEmail", new Integer(179), new Integer(87), INTEGERS[6], new Short(tabIndex++), new Integer(145) }); lblCopyright = insertLabel("lblCopyright", PROPNAMES_LBL, @@ -686,7 +687,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC txtCopyright = insertTextField("txtCopyright", null, PROPNAMES_TXT, new Object[] { - INTEGER_12, "HID:" + HID6_TXT_SITE_COPYRIGHT, "txtCopyright", new Integer(179), new Integer(106), INTEGERS[6], new Short(tabIndex++), new Integer(145) + INTEGER_12, HelpIds.getHelpIdString(HID6_TXT_SITE_COPYRIGHT), "txtCopyright", new Integer(179), new Integer(106), INTEGERS[6], new Short(tabIndex++), new Integer(145) }); @@ -703,7 +704,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + HID6_DATE_SITE_CREATED, "dateSiteCreated", new Integer(179), new Integer(124), INTEGERS[6], new Short(tabIndex++), new Integer(49) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID6_DATE_SITE_CREATED), "dateSiteCreated", new Integer(179), new Integer(124), INTEGERS[6], new Short(tabIndex++), new Integer(49) }); lblSiteUpdated = insertLabel("lblSiteUpdated", PROPNAMES_LBL, @@ -719,7 +720,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + HID6_DATE_SITE_UPDATED, "dateSiteUpdate", new Integer(179), new Integer(142), INTEGERS[6], new Short(tabIndex++), new Integer(49) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID6_DATE_SITE_UPDATED), "dateSiteUpdate", new Integer(179), new Integer(142), INTEGERS[6], new Short(tabIndex++), new Integer(49) }); @@ -748,7 +749,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID7_BTN_PREVIEW, resources.resbtnPreview_value, "btnPreview", new Integer(103), new Integer(40), INTEGERS[7], new Short(tabIndex++), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID7_BTN_PREVIEW), resources.resbtnPreview_value, "btnPreview", new Integer(103), new Integer(40), INTEGERS[7], new Short(tabIndex++), INTEGER_50 }); lblCreateSite = insertFixedLine("lblCreateSite", @@ -762,45 +763,45 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID7_CHK_PUBLISH_LOCAL, resources.reschkLocalDir_value, "chkLocalDir", new Integer(103), new Integer(68), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215) + INTEGERS[8], HelpIds.getHelpIdString(HID7_CHK_PUBLISH_LOCAL), resources.reschkLocalDir_value, "chkLocalDir", new Integer(103), new Integer(68), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215) }); txtLocalDir = insertTextField("txtLocalDir", null, PROPNAMES_TXT, new Object[] { - INTEGER_12, "HID:" + HID7_TXT_LOCAL, "txtLocalDir", new Integer(113), new Integer(78), INTEGERS[7], new Short(tabIndex++), new Integer(190) + INTEGER_12, HelpIds.getHelpIdString(HID7_TXT_LOCAL), "txtLocalDir", new Integer(113), new Integer(78), INTEGERS[7], new Short(tabIndex++), new Integer(190) }); btnLocalDir = insertButton("btnLocalDir", BTNLOCALDIR_ACTION_PERFORMED, PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID7_BTN_LOCAL, resources.resbtnLocalDir_value, "btnLocalDir", new Integer(308), new Integer(77), INTEGERS[7], new Short(tabIndex++), INTEGER_16 + INTEGER_14, HelpIds.getHelpIdString(HID7_BTN_LOCAL), resources.resbtnLocalDir_value, "btnLocalDir", new Integer(308), new Integer(77), INTEGERS[7], new Short(tabIndex++), INTEGER_16 }); chkZip = insertCheckBox("chkZip", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[9], "HID:" + HID7_CHK_PUBLISH_ZIP, resources.reschkZip_value, "chkZip", new Integer(103), new Integer(96), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215) + INTEGERS[9], HelpIds.getHelpIdString(HID7_CHK_PUBLISH_ZIP), resources.reschkZip_value, "chkZip", new Integer(103), new Integer(96), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215) }); txtZip = insertTextField("txtZip", null, PROPNAMES_TXT, new Object[] { - INTEGER_12, "HID:" + HID7_TXT_ZIP, "txtZip", new Integer(113), new Integer(108), INTEGERS[7], new Short(tabIndex++), new Integer(190) + INTEGER_12, HelpIds.getHelpIdString(HID7_TXT_ZIP), "txtZip", new Integer(113), new Integer(108), INTEGERS[7], new Short(tabIndex++), new Integer(190) }); btnZip = insertButton("btnZip", BTNZIP_ACTION_PERFORMED, PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID7_BTN_ZIP, resources.resbtnZip_value, "btnZip", new Integer(308), new Integer(107), INTEGERS[7], new Short(tabIndex++), INTEGER_16 + INTEGER_14, HelpIds.getHelpIdString(HID7_BTN_ZIP), resources.resbtnZip_value, "btnZip", new Integer(308), new Integer(107), INTEGERS[7], new Short(tabIndex++), INTEGER_16 }); chkFTP = insertCheckBox("chkFTP", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID7_CHK_PUBLISH_FTP, resources.reschkFTP_value, "chkFTP", new Integer(103), new Integer(124), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215) + INTEGERS[8], HelpIds.getHelpIdString(HID7_CHK_PUBLISH_FTP), resources.reschkFTP_value, "chkFTP", new Integer(103), new Integer(124), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215) }); Integer FTP_STEP = disableFTP ? new Integer(99) : INTEGERS[7]; @@ -819,7 +820,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID7_BTN_FTP, resources.resbtnFTP_value, "btnFTP", new Integer(274), new Integer(133), FTP_STEP, new Short(tabIndex++), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID7_BTN_FTP), resources.resbtnFTP_value, "btnFTP", new Integer(274), new Integer(133), FTP_STEP, new Short(tabIndex++), INTEGER_50 }); if (disableFTP) @@ -857,7 +858,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_CHKBOX, new Object[] { - INTEGERS[9], "HID:" + HID7_CHK_SAVE, resources.reschkSaveSettings_value, "chkSaveSettings", new Integer(97), new Integer(157), new Short((short) 1), INTEGERS[7], new Short(tabIndex++), new Integer(215) + INTEGERS[9], HelpIds.getHelpIdString(HID7_CHK_SAVE), resources.reschkSaveSettings_value, "chkSaveSettings", new Integer(97), new Integer(157), new Short((short) 1), INTEGERS[7], new Short(tabIndex++), new Integer(215) }); lblSaveSettings = insertLabel("lblSaveSettings", PROPNAMES_LBL, @@ -872,7 +873,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - Boolean.TRUE, Boolean.TRUE, INTEGER_12, "HID:" + HID7_TXT_SAVE, new Short((short) 14), "txtSaveSettings", new Integer(179), new Integer(167), INTEGERS[7], new Short(tabIndex++), new Integer(145) + Boolean.TRUE, Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID7_TXT_SAVE), new Short((short) 14), "txtSaveSettings", new Integer(179), new Integer(167), INTEGERS[7], new Short(tabIndex++), new Integer(145) }); } diff --git a/wizards/com/sun/star/wizards/web/makefile.mk b/wizards/com/sun/star/wizards/web/makefile.mk index 9cc97e1b8..2e0394d29 100644 --- a/wizards/com/sun/star/wizards/web/makefile.mk +++ b/wizards/com/sun/star/wizards/web/makefile.mk @@ -83,3 +83,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +ALLTAR : $(MISC)/web.component + +$(MISC)/web.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + web.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt web.component diff --git a/wizards/com/sun/star/wizards/web/web.component b/wizards/com/sun/star/wizards/web/web.component new file mode 100644 index 000000000..763438f96 --- /dev/null +++ b/wizards/com/sun/star/wizards/web/web.component @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.Java2" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation + name="com.sun.star.wizards.web.CallWizard$WizardImplementation"> + <service name="com.sun.star.wizards.web.CallWizard"/> + </implementation> +</component> diff --git a/wizards/prj/d.lst b/wizards/prj/d.lst index 4d1ad83d1..f8ab876ba 100644 --- a/wizards/prj/d.lst +++ b/wizards/prj/d.lst @@ -13,3 +13,11 @@ mkdir: %_DEST%\pck%_EXT% REM ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar +..\%__SRC%\misc\agenda.component %_DEST%\xml%_EXT%\agenda.component +..\%__SRC%\misc\fax.component %_DEST%\xml%_EXT%\fax.component +..\%__SRC%\misc\form.component %_DEST%\xml%_EXT%\form.component +..\%__SRC%\misc\letter.component %_DEST%\xml%_EXT%\letter.component +..\%__SRC%\misc\query.component %_DEST%\xml%_EXT%\query.component +..\%__SRC%\misc\report.component %_DEST%\xml%_EXT%\report.component +..\%__SRC%\misc\table.component %_DEST%\xml%_EXT%\table.component +..\%__SRC%\misc\web.component %_DEST%\xml%_EXT%\web.component diff --git a/wizards/source/depot/Dialog2.xdl b/wizards/source/depot/Dialog2.xdl index a46fe9f5b..652acaa19 100644 --- a/wizards/source/depot/Dialog2.xdl +++ b/wizards/source/depot/Dialog2.xdl @@ -1,34 +1,34 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd"> -<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog2" dlg:tab-index="0" dlg:left="91" dlg:top="24" dlg:width="220" dlg:height="128" dlg:page="1" dlg:help-url="HID:34520" dlg:closeable="true" dlg:moveable="true"> +<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog2" dlg:tab-index="0" dlg:left="91" dlg:top="24" dlg:width="220" dlg:height="128" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_DIALOG_SELLBUY" dlg:closeable="true" dlg:moveable="true"> <dlg:bulletinboard> <dlg:text dlg:id="lblStockNames" dlg:tab-index="0" dlg:left="6" dlg:top="6" dlg:width="102" dlg:height="8" dlg:value="lblStockNames"/> - <dlg:menulist dlg:id="lstSellStocks" dlg:tab-index="1" dlg:left="6" dlg:top="17" dlg:width="102" dlg:height="12" dlg:page="1" dlg:help-url="HID:34530" dlg:spin="true"> + <dlg:menulist dlg:id="lstSellStocks" dlg:tab-index="1" dlg:left="6" dlg:top="17" dlg:width="102" dlg:height="12" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_1_LSTSELLSTOCKS" dlg:spin="true"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Depot.Depot.SelectStockname?language=Basic&location=application" script:language="Script"/> </dlg:menulist> - <dlg:combobox dlg:id="lstBuyStocks" dlg:tab-index="2" dlg:left="6" dlg:top="17" dlg:width="102" dlg:height="12" dlg:page="2" dlg:help-url="HID:34531" dlg:spin="true"> + <dlg:combobox dlg:id="lstBuyStocks" dlg:tab-index="2" dlg:left="6" dlg:top="17" dlg:width="102" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_2_LSTBUYSTOCKS" dlg:spin="true"> <script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:Depot.Depot.SelectStockname?language=Basic&location=application" script:language="Script"/> </dlg:combobox> <dlg:text dlg:id="lblStockID" dlg:tab-index="3" dlg:left="150" dlg:top="6" dlg:width="66" dlg:height="8" dlg:value="lblStockID"/> - <dlg:textfield dlg:id="txtStockID" dlg:tab-index="4" dlg:left="150" dlg:top="17" dlg:width="40" dlg:height="12" dlg:help-url="HID:34521"/> + <dlg:textfield dlg:id="txtStockID" dlg:tab-index="4" dlg:left="150" dlg:top="17" dlg:width="40" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY"/> <dlg:text dlg:id="lblQuantity" dlg:tab-index="5" dlg:left="6" dlg:top="36" dlg:width="57" dlg:height="8" dlg:value="lblQuantity"/> - <dlg:numericfield dlg:id="txtQuantity" dlg:tab-index="6" dlg:left="6" dlg:top="47" dlg:width="46" dlg:height="12" dlg:help-url="HID:34522" dlg:decimal-accuracy="0" dlg:value-min="1"/> - <dlg:currencyfield dlg:id="txtRate" dlg:tab-index="7" dlg:left="68" dlg:top="47" dlg:width="40" dlg:height="12" dlg:help-url="HID:34523" dlg:value-min="0"/> - <dlg:datefield dlg:id="txtDate" dlg:tab-index="8" dlg:left="150" dlg:top="47" dlg:width="50" dlg:height="12" dlg:tag="Dialog2" dlg:help-url="HID:34524" dlg:strict-format="true" dlg:spin="true"> + <dlg:numericfield dlg:id="txtQuantity" dlg:tab-index="6" dlg:left="6" dlg:top="47" dlg:width="46" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_TXTQUANTITY" dlg:decimal-accuracy="0" dlg:value-min="1"/> + <dlg:currencyfield dlg:id="txtRate" dlg:tab-index="7" dlg:left="68" dlg:top="47" dlg:width="40" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_TXTRATE" dlg:value-min="0"/> + <dlg:datefield dlg:id="txtDate" dlg:tab-index="8" dlg:left="150" dlg:top="47" dlg:width="50" dlg:height="12" dlg:tag="Dialog2" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_TXTDATE" dlg:strict-format="true" dlg:spin="true"> <script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:Depot.tools.CheckInputDate?language=Basic&location=application" script:language="Script"/> </dlg:datefield> <dlg:text dlg:id="lblRate" dlg:tab-index="9" dlg:left="68" dlg:top="36" dlg:width="77" dlg:height="8" dlg:value="lblRate"/> <dlg:text dlg:id="lblDate" dlg:tab-index="10" dlg:left="150" dlg:top="37" dlg:width="66" dlg:height="8" dlg:value="lblDate"/> - <dlg:formattedfield dlg:id="txtCommission" dlg:tab-index="11" dlg:left="6" dlg:top="90" dlg:width="40" dlg:height="12" dlg:help-url="HID:34525" dlg:format-code="0,00%" dlg:format-locale="de;DE"/> + <dlg:formattedfield dlg:id="txtCommission" dlg:tab-index="11" dlg:left="6" dlg:top="90" dlg:width="40" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_TXTCOMMISSION" dlg:format-code="0,00%" dlg:format-locale="de;DE"/> <dlg:text dlg:id="lblCommission" dlg:tab-index="12" dlg:left="6" dlg:top="79" dlg:width="60" dlg:height="8" dlg:value="lblCommission"/> - <dlg:currencyfield dlg:id="txtFix" dlg:tab-index="13" dlg:left="68" dlg:top="90" dlg:width="40" dlg:height="12" dlg:help-url="HID:34526" dlg:value-min="0"/> - <dlg:currencyfield dlg:id="txtMinimum" dlg:tab-index="14" dlg:left="150" dlg:top="90" dlg:width="40" dlg:height="12" dlg:help-url="HID:34527" dlg:value-min="0"/> + <dlg:currencyfield dlg:id="txtFix" dlg:tab-index="13" dlg:left="68" dlg:top="90" dlg:width="40" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_TXTFIX" dlg:value-min="0"/> + <dlg:currencyfield dlg:id="txtMinimum" dlg:tab-index="14" dlg:left="150" dlg:top="90" dlg:width="40" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_TXTMINIMUM" dlg:value-min="0"/> <dlg:text dlg:id="lblFix" dlg:tab-index="15" dlg:left="68" dlg:top="79" dlg:width="71" dlg:height="8" dlg:value="lblFix"/> <dlg:text dlg:id="lblMinimum" dlg:tab-index="16" dlg:left="150" dlg:top="79" dlg:width="66" dlg:height="8" dlg:value="lblMinimum"/> - <dlg:button dlg:id="cmdCancel" dlg:tab-index="17" dlg:left="58" dlg:top="109" dlg:width="50" dlg:height="14" dlg:help-url="HID:34528" dlg:value="cmdCancel"> + <dlg:button dlg:id="cmdCancel" dlg:tab-index="17" dlg:left="58" dlg:top="109" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SELLBUY" dlg:value="cmdCancel"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Depot.Depot.CancelTransaction?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdGoOn" dlg:tab-index="18" dlg:left="111" dlg:top="109" dlg:width="50" dlg:height="14" dlg:help-url="HID:34529" dlg:value="cmdGoOn"> + <dlg:button dlg:id="cmdGoOn" dlg:tab-index="18" dlg:left="111" dlg:top="109" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_SELLBUY" dlg:value="cmdGoOn"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Depot.Depot.TransactionOk?language=Basic&location=application" script:language="Script"/> </dlg:button> <dlg:fixedline dlg:id="hlnCommission" dlg:tab-index="19" dlg:left="6" dlg:top="66" dlg:width="210" dlg:height="8" dlg:value="hlnCommission"/> diff --git a/wizards/source/depot/Dialog3.xdl b/wizards/source/depot/Dialog3.xdl index 4c6cabd20..87bda0197 100644 --- a/wizards/source/depot/Dialog3.xdl +++ b/wizards/source/depot/Dialog3.xdl @@ -1,34 +1,34 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd"> -<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog3" dlg:left="161" dlg:top="81" dlg:width="176" dlg:height="119" dlg:page="3" dlg:help-url="HID:34532" dlg:closeable="true" dlg:moveable="true"> +<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog3" dlg:left="161" dlg:top="81" dlg:width="176" dlg:height="119" dlg:page="3" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_DIALOG_SPLIT" dlg:closeable="true" dlg:moveable="true"> <dlg:bulletinboard> <dlg:text dlg:id="lblStockNames" dlg:tab-index="0" dlg:left="6" dlg:top="6" dlg:width="98" dlg:height="8" dlg:value="lblStockNames"/> - <dlg:menulist dlg:id="lstStockNames" dlg:tab-index="1" dlg:left="5" dlg:top="17" dlg:width="102" dlg:height="12" dlg:help-url="HID:34533" dlg:spin="true"> + <dlg:menulist dlg:id="lstStockNames" dlg:tab-index="1" dlg:left="5" dlg:top="17" dlg:width="102" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_LSTSTOCKNAMES" dlg:spin="true"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Depot.Depot.SelectStockNameForRates?language=Basic&location=application" script:language="Script"/> </dlg:menulist> - <dlg:textfield dlg:id="txtStockID" dlg:tab-index="2" dlg:left="120" dlg:top="17" dlg:width="50" dlg:height="12" dlg:help-url="HID:34534"/> - <dlg:datefield dlg:id="txtStartDate" dlg:tab-index="3" dlg:left="63" dlg:top="37" dlg:width="50" dlg:height="12" dlg:page="3" dlg:help-url="HID:34543" dlg:spin="true"> + <dlg:textfield dlg:id="txtStockID" dlg:tab-index="2" dlg:left="120" dlg:top="17" dlg:width="50" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SPLIT"/> + <dlg:datefield dlg:id="txtStartDate" dlg:tab-index="3" dlg:left="63" dlg:top="37" dlg:width="50" dlg:height="12" dlg:page="3" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_3_TXTSTARTDATE" dlg:spin="true"> <script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:Depot.tools.CheckInputDate?language=Basic&location=application" script:language="Script"/> </dlg:datefield> - <dlg:datefield dlg:id="txtEndDate" dlg:tab-index="4" dlg:left="63" dlg:top="53" dlg:width="50" dlg:height="12" dlg:page="3" dlg:help-url="HID:34544" dlg:spin="true"> + <dlg:datefield dlg:id="txtEndDate" dlg:tab-index="4" dlg:left="63" dlg:top="53" dlg:width="50" dlg:height="12" dlg:page="3" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_3_TXTENDDATE" dlg:spin="true"> <script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:Depot.tools.CheckInputDate?language=Basic&location=application" script:language="Script"/> </dlg:datefield> <dlg:radiogroup> - <dlg:radio dlg:id="optDaily" dlg:tab-index="5" dlg:left="12" dlg:top="83" dlg:width="75" dlg:height="10" dlg:page="3" dlg:help-url="HID:34545" dlg:value="optDaily"/> - <dlg:radio dlg:id="optWeekly" dlg:tab-index="6" dlg:left="101" dlg:top="83" dlg:width="69" dlg:height="10" dlg:page="3" dlg:help-url="HID:34546" dlg:value="optWeekly"/> + <dlg:radio dlg:id="optDaily" dlg:tab-index="5" dlg:left="12" dlg:top="83" dlg:width="75" dlg:height="10" dlg:page="3" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_3_OPTDAILY" dlg:value="optDaily"/> + <dlg:radio dlg:id="optWeekly" dlg:tab-index="6" dlg:left="101" dlg:top="83" dlg:width="69" dlg:height="10" dlg:page="3" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_3_OPTWEEKLY" dlg:value="optWeekly"/> </dlg:radiogroup> - <dlg:datefield dlg:id="txtDate" dlg:tab-index="7" dlg:left="71" dlg:top="73" dlg:width="50" dlg:height="12" dlg:page="2" dlg:help-url="HID:34542" dlg:spin="true"> + <dlg:datefield dlg:id="txtDate" dlg:tab-index="7" dlg:left="71" dlg:top="73" dlg:width="50" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_2_TXTDATE" dlg:spin="true"> <script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:Depot.tools.CheckInputDate?language=Basic&location=application" script:language="Script"/> </dlg:datefield> <dlg:radiogroup> - <dlg:radio dlg:id="optPerShare" dlg:tab-index="8" dlg:left="6" dlg:top="37" dlg:width="69" dlg:height="10" dlg:page="1" dlg:help-url="HID:34537" dlg:value="optPerShare"/> - <dlg:radio dlg:id="optTotal" dlg:tab-index="9" dlg:left="6" dlg:top="51" dlg:width="69" dlg:height="10" dlg:page="1" dlg:help-url="HID:34538" dlg:value="optTotal"/> + <dlg:radio dlg:id="optPerShare" dlg:tab-index="8" dlg:left="6" dlg:top="37" dlg:width="69" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_1_OPTPERSHARE" dlg:value="optPerShare"/> + <dlg:radio dlg:id="optTotal" dlg:tab-index="9" dlg:left="6" dlg:top="51" dlg:width="69" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_1_OPTTOTAL" dlg:value="optTotal"/> </dlg:radiogroup> - <dlg:currencyfield dlg:id="txtDividend" dlg:tab-index="10" dlg:left="6" dlg:top="80" dlg:width="50" dlg:height="12" dlg:page="1" dlg:help-url="HID:34539" dlg:value-min="0" dlg:spin="true"/> - <dlg:button dlg:id="cmdCancel" dlg:tab-index="11" dlg:left="41" dlg:top="98" dlg:width="50" dlg:height="14" dlg:help-url="HID:34535" dlg:value="cmdCancel"> + <dlg:currencyfield dlg:id="txtDividend" dlg:tab-index="10" dlg:left="6" dlg:top="80" dlg:width="50" dlg:height="12" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_1_TXTDIVIDEND" dlg:value-min="0" dlg:spin="true"/> + <dlg:button dlg:id="cmdCancel" dlg:tab-index="11" dlg:left="41" dlg:top="98" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SPLIT" dlg:value="cmdCancel"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Depot.Depot.CancelStockRate?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdGoOn" dlg:tab-index="12" dlg:left="94" dlg:top="98" dlg:width="50" dlg:height="14" dlg:help-url="HID:34536" dlg:value="cmdGoOn"> + <dlg:button dlg:id="cmdGoOn" dlg:tab-index="12" dlg:left="94" dlg:top="98" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_SPLIT" dlg:value="cmdGoOn"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Depot.Depot.CommitStockRate?language=Basic&location=application" script:language="Script"/> </dlg:button> <dlg:text dlg:id="lblStockID" dlg:tab-index="13" dlg:left="120" dlg:top="6" dlg:width="50" dlg:height="8" dlg:value="lblStockID"/> @@ -39,7 +39,7 @@ <dlg:fixedline dlg:id="hlnInterval" dlg:tab-index="18" dlg:left="6" dlg:top="72" dlg:width="164" dlg:height="8" dlg:page="3" dlg:value="hlnInterval"/> <dlg:text dlg:id="lblStartDate" dlg:tab-index="19" dlg:left="6" dlg:top="39" dlg:width="53" dlg:height="8" dlg:page="3" dlg:value="lblStartDate"/> <dlg:text dlg:id="lblEndDate" dlg:tab-index="20" dlg:left="6" dlg:top="55" dlg:width="53" dlg:height="8" dlg:page="3" dlg:value="lblEndDate"/> - <dlg:numericfield dlg:id="txtOldRate" dlg:tab-index="21" dlg:left="6" dlg:top="53" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:34540" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:spin="true"/> - <dlg:numericfield dlg:id="txtNewRate" dlg:tab-index="22" dlg:left="50" dlg:top="53" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:34541" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:spin="true"/> + <dlg:numericfield dlg:id="txtOldRate" dlg:tab-index="21" dlg:left="6" dlg:top="53" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_2_TXTOLDRATE" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:spin="true"/> + <dlg:numericfield dlg:id="txtNewRate" dlg:tab-index="22" dlg:left="50" dlg:top="53" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_2_TXTNEWRATE" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:spin="true"/> </dlg:bulletinboard> </dlg:window>
\ No newline at end of file diff --git a/wizards/source/depot/Dialog4.xdl b/wizards/source/depot/Dialog4.xdl index 4f71be0da..f5c86ce47 100644 --- a/wizards/source/depot/Dialog4.xdl +++ b/wizards/source/depot/Dialog4.xdl @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd"> -<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog4" dlg:left="161" dlg:top="81" dlg:width="160" dlg:height="120" dlg:page="1" dlg:help-url="HID:34547" dlg:closeable="true" dlg:moveable="true"> +<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog4" dlg:left="161" dlg:top="81" dlg:width="160" dlg:height="120" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_DIALOG_HISTORY" dlg:closeable="true" dlg:moveable="true"> <dlg:bulletinboard> <dlg:text dlg:id="lblWelcome" dlg:tab-index="0" dlg:left="6" dlg:top="6" dlg:width="148" dlg:height="49" dlg:value="lblWelcome" dlg:multiline="true"/> <dlg:text dlg:id="lblHint" dlg:tab-index="1" dlg:left="6" dlg:top="73" dlg:width="148" dlg:height="26" dlg:value="lblHint" dlg:multiline="true"/> - <dlg:button dlg:id="cmdCancel" dlg:tab-index="2" dlg:left="28" dlg:top="100" dlg:width="50" dlg:height="14" dlg:help-url="HID:34549" dlg:value="cmdCancel"> + <dlg:button dlg:id="cmdCancel" dlg:tab-index="2" dlg:left="28" dlg:top="100" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_HISTORY" dlg:value="cmdCancel"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Depot.Currency.CloseStartUpDialog?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdGoOn" dlg:tab-index="3" dlg:left="84" dlg:top="100" dlg:width="52" dlg:height="14" dlg:help-url="HID:34550" dlg:value="cmdGoOn"> + <dlg:button dlg:id="cmdGoOn" dlg:tab-index="3" dlg:left="84" dlg:top="100" dlg:width="52" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_HISTORY" dlg:value="cmdGoOn"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Depot.Currency.ChooseMarket?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:menulist dlg:id="lstMarkets" dlg:tab-index="4" dlg:left="6" dlg:top="57" dlg:width="148" dlg:height="12" dlg:help-url="HID:34548" dlg:spin="true"> + <dlg:menulist dlg:id="lstMarkets" dlg:tab-index="4" dlg:left="6" dlg:top="57" dlg:width="148" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGDEPOT_LSTMARKETS" dlg:spin="true"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Depot.Currency.EnableGoOnButton?language=Basic&location=application" script:language="Script"/> </dlg:menulist> </dlg:bulletinboard> diff --git a/wizards/source/euro/DlgConvert.xdl b/wizards/source/euro/DlgConvert.xdl index 43bfeea34..18f3caef0 100644 --- a/wizards/source/euro/DlgConvert.xdl +++ b/wizards/source/euro/DlgConvert.xdl @@ -1,52 +1,52 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd"> -<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DialogConvert" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="2" dlg:help-url="HID:34660" dlg:closeable="true" dlg:moveable="true"> +<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DialogConvert" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_DIALOG" dlg:closeable="true" dlg:moveable="true"> <dlg:bulletinboard> <dlg:text dlg:id="lblCurrencies" dlg:tab-index="1" dlg:left="170" dlg:top="39" dlg:width="89" dlg:height="8" dlg:value="lblCurrencies"/> - <dlg:checkbox dlg:id="chkComplete" dlg:tab-index="0" dlg:left="12" dlg:top="43" dlg:width="129" dlg:height="10" dlg:page="1" dlg:help-url="HID:34661" dlg:value="chkComplete" dlg:checked="true"> + <dlg:checkbox dlg:id="chkComplete" dlg:tab-index="0" dlg:left="12" dlg:top="43" dlg:width="129" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CHECKBOX1" dlg:value="chkComplete" dlg:checked="true"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Euro.ConvertRun.RetrieveEnableValue?language=Basic&location=application" script:language="Script"/> </dlg:checkbox> - <dlg:menulist dlg:id="lstCurrencies" dlg:tab-index="2" dlg:left="170" dlg:top="51" dlg:width="90" dlg:height="12" dlg:help-url="HID:34669" dlg:spin="true" dlg:linecount="12"> + <dlg:menulist dlg:id="lstCurrencies" dlg:tab-index="2" dlg:left="170" dlg:top="51" dlg:width="90" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_COMBOBOX1" dlg:spin="true" dlg:linecount="12"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Euro.Common.SelectCurrency?language=Basic&location=application" script:language="Script"/> </dlg:menulist> <dlg:radiogroup> - <dlg:radio dlg:id="optCellTemplates" dlg:tab-index="3" dlg:left="12" dlg:top="96" dlg:width="129" dlg:height="10" dlg:page="1" dlg:help-url="HID:34662" dlg:value="optCellTemplates"> + <dlg:radio dlg:id="optCellTemplates" dlg:tab-index="3" dlg:left="12" dlg:top="96" dlg:width="129" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON1" dlg:value="optCellTemplates"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.Soft.CreateStyleEnumeration?language=Basic&location=application" script:language="Script"/> </dlg:radio> - <dlg:radio dlg:id="optSheetRanges" dlg:tab-index="4" dlg:left="12" dlg:top="110" dlg:width="130" dlg:height="10" dlg:page="1" dlg:help-url="HID:34663" dlg:value="optSheetRanges"> + <dlg:radio dlg:id="optSheetRanges" dlg:tab-index="4" dlg:left="12" dlg:top="110" dlg:width="130" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON2" dlg:value="optSheetRanges"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.Hard.CreateRangeList?language=Basic&location=application" script:language="Script"/> </dlg:radio> - <dlg:radio dlg:id="optDocRanges" dlg:tab-index="5" dlg:left="12" dlg:top="124" dlg:width="130" dlg:height="10" dlg:page="1" dlg:help-url="HID:34664" dlg:value="optDocRanges"> + <dlg:radio dlg:id="optDocRanges" dlg:tab-index="5" dlg:left="12" dlg:top="124" dlg:width="130" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON3" dlg:value="optDocRanges"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.Hard.CreateRangeList?language=Basic&location=application" script:language="Script"/> </dlg:radio> - <dlg:radio dlg:id="optSelRange" dlg:tab-index="6" dlg:left="12" dlg:top="138" dlg:width="130" dlg:height="10" dlg:page="1" dlg:help-url="HID:34665" dlg:value="optSelRange"> + <dlg:radio dlg:id="optSelRange" dlg:tab-index="6" dlg:left="12" dlg:top="138" dlg:width="130" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON4" dlg:value="optSelRange"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.ConvertRun.CheckRangeSelection?language=Basic&location=application" script:language="Script"/> </dlg:radio> </dlg:radiogroup> <dlg:text dlg:id="lblSelection" dlg:tab-index="7" dlg:left="170" dlg:top="84" dlg:width="73" dlg:height="8" dlg:page="1" dlg:value="lblSelection"/> - <dlg:menulist dlg:id="lstSelection" dlg:tab-index="8" dlg:left="170" dlg:top="96" dlg:width="90" dlg:height="52" dlg:page="1" dlg:help-url="HID:34666" dlg:multiselection="true"> + <dlg:menulist dlg:id="lstSelection" dlg:tab-index="8" dlg:left="170" dlg:top="96" dlg:width="90" dlg:height="52" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_LISTBOX1" dlg:multiselection="true"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Euro.ConvertRun.SelectListItem?language=Basic&location=application" script:language="Script"/> </dlg:menulist> <dlg:radiogroup> - <dlg:radio dlg:id="optSingleFile" dlg:tab-index="9" dlg:left="12" dlg:top="51" dlg:width="146" dlg:height="10" dlg:page="2" dlg:help-url="HID:34667" dlg:value="optSingleFile"> + <dlg:radio dlg:id="optSingleFile" dlg:tab-index="9" dlg:left="12" dlg:top="51" dlg:width="146" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_OBFILE" dlg:value="optSingleFile"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.AutoPilotRun.SwapExtent?language=Basic&location=application" script:language="Script"/> </dlg:radio> - <dlg:radio dlg:id="optWholeDir" dlg:tab-index="10" dlg:left="12" dlg:top="65" dlg:width="146" dlg:height="10" dlg:page="2" dlg:help-url="HID:34668" dlg:value="optWholeDir" dlg:checked="true"> + <dlg:radio dlg:id="optWholeDir" dlg:tab-index="10" dlg:left="12" dlg:top="65" dlg:width="146" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_OBDIR" dlg:value="optWholeDir" dlg:checked="true"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.AutoPilotRun.SwapExtent?language=Basic&location=application" script:language="Script"/> </dlg:radio> </dlg:radiogroup> <dlg:textfield dlg:id="txtConfig" dlg:tab-index="11" dlg:left="6" dlg:top="50" dlg:width="258" dlg:height="55" dlg:page="3" dlg:vscroll="true" dlg:multiline="true" dlg:readonly="true"/> - <dlg:textfield dlg:id="txtSource" dlg:tab-index="12" dlg:left="80" dlg:top="82" dlg:width="165" dlg:height="12" dlg:page="2" dlg:help-url="HID:34670"> + <dlg:textfield dlg:id="txtSource" dlg:tab-index="12" dlg:left="80" dlg:top="82" dlg:width="165" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_TBSOURCE"> <script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:Euro.AutoPilotRun.ToggleGoOnButton?language=Basic&location=application" script:language="Script"/> </dlg:textfield> - <dlg:button dlg:id="cmdCallSourceDialog" dlg:tab-index="13" dlg:left="249" dlg:top="81" dlg:width="15" dlg:height="14" dlg:page="2" dlg:help-url="HID:34677" dlg:value="..."> + <dlg:button dlg:id="cmdCallSourceDialog" dlg:tab-index="13" dlg:left="249" dlg:top="81" dlg:width="15" dlg:height="14" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CBSOURCEOPEN" dlg:value="..."> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.AutoPilotRun.CallFilePicker?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:checkbox dlg:id="chkRecursive" dlg:tab-index="14" dlg:left="12" dlg:top="98" dlg:width="252" dlg:height="10" dlg:page="2" dlg:help-url="HID:34671" dlg:value="chkRecursive" dlg:checked="false"/> - <dlg:checkbox dlg:id="chkTextDocuments" dlg:tab-index="15" dlg:left="12" dlg:top="112" dlg:width="251" dlg:height="10" dlg:page="2" dlg:help-url="HID:34680" dlg:value="chkTextDocuments" dlg:checked="false"/> - <dlg:checkbox dlg:id="chkProtect" dlg:tab-index="16" dlg:left="12" dlg:top="126" dlg:width="251" dlg:height="10" dlg:page="2" dlg:help-url="HID:34679" dlg:value="chkProtect" dlg:checked="false"/> - <dlg:textfield dlg:id="txtTarget" dlg:tab-index="17" dlg:left="80" dlg:top="143" dlg:width="165" dlg:height="12" dlg:page="2" dlg:help-url="HID:34672"/> - <dlg:button dlg:id="cmdCallTargetDialog" dlg:tab-index="18" dlg:left="249" dlg:top="142" dlg:width="15" dlg:height="14" dlg:page="2" dlg:help-url="HID:34678" dlg:value="..."> + <dlg:checkbox dlg:id="chkRecursive" dlg:tab-index="14" dlg:left="12" dlg:top="98" dlg:width="252" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CHECKRECURSIVE" dlg:value="chkRecursive" dlg:checked="false"/> + <dlg:checkbox dlg:id="chkTextDocuments" dlg:tab-index="15" dlg:left="12" dlg:top="112" dlg:width="251" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CHKTEXTDOCUMENTS" dlg:value="chkTextDocuments" dlg:checked="false"/> + <dlg:checkbox dlg:id="chkProtect" dlg:tab-index="16" dlg:left="12" dlg:top="126" dlg:width="251" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CHKPROTECT" dlg:value="chkProtect" dlg:checked="false"/> + <dlg:textfield dlg:id="txtTarget" dlg:tab-index="17" dlg:left="80" dlg:top="143" dlg:width="165" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_TBTARGET"/> + <dlg:button dlg:id="cmdCallTargetDialog" dlg:tab-index="18" dlg:left="249" dlg:top="142" dlg:width="15" dlg:height="14" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CBTARGETOPEN" dlg:value="..."> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.AutoPilotRun.CallFolderPicker?language=Basic&location=application" script:language="Script"/> </dlg:button> <dlg:progressmeter dlg:id="ProgressBar" dlg:tab-index="19" dlg:left="85" dlg:top="152" dlg:width="179" dlg:height="10" dlg:page="3"/> @@ -63,14 +63,14 @@ <dlg:fixedline dlg:id="hlnProgress" dlg:tab-index="30" dlg:left="6" dlg:top="108" dlg:width="258" dlg:height="8" dlg:page="3" dlg:value="hlnProgress"/> <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="31" dlg:left="6" dlg:top="152" dlg:width="258" dlg:height="9" dlg:page="1"/> <dlg:text dlg:id="lblProgress" dlg:tab-index="32" dlg:left="6" dlg:top="153" dlg:width="79" dlg:height="8" dlg:page="3" dlg:value="lblProgress"/> - <dlg:button dlg:id="cmdCancel" dlg:tab-index="33" dlg:left="6" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:34673" dlg:value="cmdCancel"> + <dlg:button dlg:id="cmdCancel" dlg:tab-index="33" dlg:left="6" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CBCANCEL" dlg:value="cmdCancel"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.Common.CancelTask?language=Basic&location=application" script:language="Script"/> </dlg:button> <dlg:button dlg:id="cmdHelp" dlg:tab-index="34" dlg:left="63" dlg:top="190" dlg:width="53" dlg:height="14" dlg:value="cmdHelp" dlg:button-type="help"/> - <dlg:button dlg:id="cmdBack" dlg:tab-index="35" dlg:left="155" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:34675" dlg:value="cmdBack"> + <dlg:button dlg:id="cmdBack" dlg:tab-index="35" dlg:left="155" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CBBACK" dlg:value="cmdBack"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.AutoPilotRun.PreviousStep?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdGoOn" dlg:tab-index="36" dlg:left="211" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:34676" dlg:value="cmdGoOn"> + <dlg:button dlg:id="cmdGoOn" dlg:tab-index="36" dlg:left="211" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CBGOON" dlg:value="cmdGoOn"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.Common.StartConversion?language=Basic&location=application" script:language="Script"/> </dlg:button> </dlg:bulletinboard> diff --git a/wizards/source/euro/DlgPassword.xdl b/wizards/source/euro/DlgPassword.xdl index def861d97..976891a48 100644 --- a/wizards/source/euro/DlgPassword.xdl +++ b/wizards/source/euro/DlgPassword.xdl @@ -2,14 +2,14 @@ <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd"> <dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DlgPassword" dlg:left="77" dlg:top="93" dlg:width="310" dlg:height="65" dlg:closeable="true" dlg:moveable="true" dlg:title="DlgPassword"> <dlg:bulletinboard> - <dlg:button dlg:id="cmdGoOn" dlg:tab-index="0" dlg:left="251" dlg:top="6" dlg:width="53" dlg:height="14" dlg:help-url="HID:34690" dlg:value="cmdGoOn"> + <dlg:button dlg:id="cmdGoOn" dlg:tab-index="0" dlg:left="251" dlg:top="6" dlg:width="53" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGPASSWORD_CMDGOON" dlg:value="cmdGoOn"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.Protect.ReadPassword?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdCancel" dlg:tab-index="1" dlg:left="251" dlg:top="24" dlg:width="53" dlg:height="14" dlg:help-url="HID:34691" dlg:value="cmdCancel"> + <dlg:button dlg:id="cmdCancel" dlg:tab-index="1" dlg:left="251" dlg:top="24" dlg:width="53" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGPASSWORD_CMDCANCEL" dlg:value="cmdCancel"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Euro.Protect.RejectPassword?language=Basic&location=application" script:language="Script"/> </dlg:button> <dlg:button dlg:id="cmdHelp" dlg:tab-index="2" dlg:left="251" dlg:top="45" dlg:width="53" dlg:height="14" dlg:tag="34692" dlg:value="cmdHelp" dlg:button-type="help"/> - <dlg:textfield dlg:id="txtPassword" dlg:tab-index="3" dlg:left="11" dlg:top="18" dlg:width="232" dlg:height="12" dlg:help-url="HID:34693" dlg:echochar="*"/> + <dlg:textfield dlg:id="txtPassword" dlg:tab-index="3" dlg:left="11" dlg:top="18" dlg:width="232" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGPASSWORD_TXTPASSWORD" dlg:echochar="*"/> <dlg:fixedline dlg:id="hlnPassword" dlg:tab-index="4" dlg:left="6" dlg:top="6" dlg:width="238" dlg:height="8" dlg:value="hlnPassword"/> </dlg:bulletinboard> </dlg:window>
\ No newline at end of file diff --git a/wizards/source/formwizard/DlgFormDB.xdl b/wizards/source/formwizard/DlgFormDB.xdl index ade138e06..269b7e618 100644 --- a/wizards/source/formwizard/DlgFormDB.xdl +++ b/wizards/source/formwizard/DlgFormDB.xdl @@ -1,30 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd"> -<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DlgFormDB" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="1" dlg:help-url="HID:34400" dlg:closeable="true" dlg:moveable="true"> +<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DlgFormDB" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGFORM_DIALOG" dlg:closeable="true" dlg:moveable="true"> <dlg:bulletinboard> <dlg:text dlg:id="lblSelFields" dlg:tab-index="10" dlg:left="154" dlg:top="70" dlg:width="110" dlg:height="8" dlg:page="1" dlg:value="lblSelFields"/> - <dlg:menulist dlg:id="lstTables" dlg:tab-index="3" dlg:left="6" dlg:top="51" dlg:width="110" dlg:height="12" dlg:page="1" dlg:help-url="HID:34411" dlg:spin="true"> + <dlg:menulist dlg:id="lstTables" dlg:tab-index="3" dlg:left="6" dlg:top="51" dlg:width="110" dlg:height="12" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGFORM_MASTER_LBTABLES" dlg:spin="true"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:FormWizard.FormWizard.FormGetFields?language=Basic&location=application" script:language="Script"/> <script:event script:event-name="on-mousedown" script:macro-name="vnd.sun.star.script:FormWizard.FormWizard.DeleteFirstTableListBoxEntry?language=Basic&location=application" script:language="Script"/> </dlg:menulist> <dlg:img dlg:id="imgTheme" dlg:tab-index="1" dlg:left="6" dlg:top="6" dlg:width="258" dlg:height="26" dlg:scale-image="false"/> <dlg:button dlg:id="cmdCancel" dlg:tab-index="33" dlg:left="6" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:34401" dlg:value="cmdCancel" dlg:button-type="cancel"/> <dlg:button dlg:id="cmdHelp" dlg:tab-index="34" dlg:left="63" dlg:top="190" dlg:width="53" dlg:height="14" dlg:tag="34400" dlg:value="cmdHelp" dlg:button-type="help"/> - <dlg:button dlg:id="cmdBack" dlg:tab-index="35" dlg:left="155" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:34402" dlg:value="cmdBack"> + <dlg:button dlg:id="cmdBack" dlg:tab-index="35" dlg:left="155" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGFORM_CMDPREV" dlg:value="cmdBack"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.FormWizard.PreviousStep?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdGoOn" dlg:tab-index="36" dlg:left="211" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:34403" dlg:value="cmdGoOn"> + <dlg:button dlg:id="cmdGoOn" dlg:tab-index="36" dlg:left="211" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGFORM_CMDNEXT" dlg:value="cmdGoOn"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.FormWizard.NextStep?language=Basic&location=application" script:language="Script"/> </dlg:button> <dlg:text dlg:id="lblTables" dlg:tab-index="2" dlg:left="6" dlg:top="40" dlg:width="72" dlg:height="8" dlg:page="1" dlg:value="lblTables"/> <dlg:text dlg:id="lblFields" dlg:tab-index="4" dlg:left="6" dlg:top="70" dlg:width="109" dlg:height="8" dlg:page="1" dlg:value="lblFields"/> - <dlg:button dlg:id="cmdMoveSelected" dlg:tab-index="6" dlg:left="122" dlg:top="84" dlg:width="25" dlg:height="14" dlg:page="1" dlg:help-url="HID:34422" dlg:value="->"> + <dlg:button dlg:id="cmdMoveSelected" dlg:tab-index="6" dlg:left="122" dlg:top="84" dlg:width="25" dlg:height="14" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGFORM_OPTONEXISTINGRELATION" dlg:value="->"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Tools.Listbox.FormMoveSelected?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdMoveAll" dlg:tab-index="7" dlg:left="122" dlg:top="101" dlg:width="25" dlg:height="14" dlg:page="1" dlg:help-url="HID:34423" dlg:value="=>>"> + <dlg:button dlg:id="cmdMoveAll" dlg:tab-index="7" dlg:left="122" dlg:top="101" dlg:width="25" dlg:height="14" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGFORM_OPTSELECTMANUALLY" dlg:value="=>>"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Tools.Listbox.FormMoveAll?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdRemoveSelected" dlg:tab-index="8" dlg:left="122" dlg:top="118" dlg:width="25" dlg:height="14" dlg:page="1" dlg:help-url="HID:34424" dlg:value="<-"> + <dlg:button dlg:id="cmdRemoveSelected" dlg:tab-index="8" dlg:left="122" dlg:top="118" dlg:width="25" dlg:height="14" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGFORM_lstRELATIONS" dlg:value="<-"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Tools.Listbox.FormRemoveSelected?language=Basic&location=application" script:language="Script"/> </dlg:button> <dlg:button dlg:id="cmdRemoveAll" dlg:tab-index="9" dlg:left="122" dlg:top="135" dlg:width="25" dlg:height="14" dlg:page="1" dlg:help-url="HID:34425" dlg:value="<<="> @@ -42,34 +42,34 @@ <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Tools.Listbox.FormMoveSelected?language=Basic&location=application" script:language="Script"/> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Tools.Listbox.FormSetMoveRights?language=Basic&location=application" script:language="Script"/> </dlg:menulist> - <dlg:menulist dlg:id="lstSelFields" dlg:tab-index="11" dlg:left="154" dlg:top="81" dlg:width="110" dlg:height="70" dlg:page="1" dlg:help-url="HID:34421" dlg:multiselection="true"> + <dlg:menulist dlg:id="lstSelFields" dlg:tab-index="11" dlg:left="154" dlg:top="81" dlg:width="110" dlg:height="70" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGFORM_CHKCREATESUBFORM" dlg:multiselection="true"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Tools.Listbox.FormRemoveSelected?language=Basic&location=application" script:language="Script"/> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Tools.Listbox.FormSetMoveRights?language=Basic&location=application" script:language="Script"/> </dlg:menulist> <dlg:text dlg:id="lblStyles" dlg:tab-index="25" dlg:left="150" dlg:top="39" dlg:width="114" dlg:height="8" dlg:page="2" dlg:value="lblStyles"/> - <dlg:button dlg:id="cmdArrange1" dlg:tab-index="16" dlg:left="12" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="1" dlg:help-url="HID:34431"> + <dlg:button dlg:id="cmdArrange1" dlg:tab-index="16" dlg:left="12" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="1" dlg:help-url="HID:WIZARDS_HID_DLGFORM_SUB_LBTABLES"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeArrangemode?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdArrange2" dlg:tab-index="17" dlg:left="39" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="2" dlg:help-url="HID:34432"> + <dlg:button dlg:id="cmdArrange2" dlg:tab-index="17" dlg:left="39" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="2" dlg:help-url="HID:WIZARDS_HID_DLGFORM_SUB_FIELDSAVAILABLE"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeArrangemode?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdArrange3" dlg:tab-index="18" dlg:left="66" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="3" dlg:help-url="HID:34433"> + <dlg:button dlg:id="cmdArrange3" dlg:tab-index="18" dlg:left="66" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="3" dlg:help-url="HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVESELECTED"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeArrangemode?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdArrange4" dlg:tab-index="19" dlg:left="93" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="4" dlg:help-url="HID:34434"> + <dlg:button dlg:id="cmdArrange4" dlg:tab-index="19" dlg:left="93" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="4" dlg:help-url="HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEALL"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeArrangemode?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdArrange5" dlg:tab-index="20" dlg:left="120" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="5" dlg:help-url="HID:34435"> + <dlg:button dlg:id="cmdArrange5" dlg:tab-index="20" dlg:left="120" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="5" dlg:help-url="HID:WIZARDS_HID_DLGFORM_SUB_CMDREMOVESELECTED"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeArrangemode?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:menulist dlg:id="lstStyles" dlg:tab-index="26" dlg:left="150" dlg:top="50" dlg:width="114" dlg:height="86" dlg:page="2" dlg:help-url="HID:34443"> + <dlg:menulist dlg:id="lstStyles" dlg:tab-index="26" dlg:left="150" dlg:top="50" dlg:width="114" dlg:height="86" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK2"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:FormWizard.tools.ImportStyles?language=Basic&location=application" script:language="Script"/> </dlg:menulist> <dlg:radiogroup> - <dlg:radio dlg:id="optBorder0" dlg:tab-index="22" dlg:left="12" dlg:top="95" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34438" dlg:value="optBorder0"> + <dlg:radio dlg:id="optBorder0" dlg:tab-index="22" dlg:left="12" dlg:top="95" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEUP" dlg:value="optBorder0"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeBorderLayouts?language=Basic&location=application" script:language="Script"/> </dlg:radio> - <dlg:radio dlg:id="optBorder1" dlg:tab-index="23" dlg:left="12" dlg:top="109" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34439" dlg:value="optBorder1"> + <dlg:radio dlg:id="optBorder1" dlg:tab-index="23" dlg:left="12" dlg:top="109" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEDOWN" dlg:value="optBorder1"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeBorderLayouts?language=Basic&location=application" script:language="Script"/> </dlg:radio> <dlg:radio dlg:id="optBorder2" dlg:tab-index="24" dlg:left="12" dlg:top="123" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34440" dlg:value="optBorder2"> @@ -78,10 +78,10 @@ </dlg:radiogroup> <dlg:fixedline dlg:id="hlnBinaries" dlg:tab-index="12" dlg:left="6" dlg:top="158" dlg:width="258" dlg:height="8" dlg:page="1" dlg:value="hlnBinaries"/> <dlg:radiogroup> - <dlg:radio dlg:id="optTiled" dlg:tab-index="31" dlg:left="156" dlg:top="154" dlg:width="81" dlg:height="10" dlg:page="2" dlg:tag="11" dlg:help-url="HID:34444" dlg:value="optTiled" dlg:checked="true"> + <dlg:radio dlg:id="optTiled" dlg:tab-index="31" dlg:left="156" dlg:top="154" dlg:width="81" dlg:height="10" dlg:page="2" dlg:tag="11" dlg:help-url="HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK2" dlg:value="optTiled" dlg:checked="true"> <script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.script:WebWizard.Common.SetBackGraphicStyle?language=Basic&location=application" script:language="Script"/> </dlg:radio> - <dlg:radio dlg:id="optArea" dlg:tab-index="32" dlg:left="156" dlg:top="168" dlg:width="81" dlg:height="10" dlg:page="2" dlg:tag="10" dlg:help-url="HID:34445" dlg:value="optArea"> + <dlg:radio dlg:id="optArea" dlg:tab-index="32" dlg:left="156" dlg:top="168" dlg:width="81" dlg:height="10" dlg:page="2" dlg:tag="10" dlg:help-url="HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK3" dlg:value="optArea"> <script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.script:WebWizard.Common.SetBackGraphicStyle?language=Basic&location=application" script:language="Script"/> </dlg:radio> </dlg:radiogroup> @@ -90,10 +90,10 @@ <dlg:fixedline dlg:id="hlnBorderLayout" dlg:tab-index="21" dlg:left="6" dlg:top="83" dlg:width="137" dlg:height="8" dlg:page="2" dlg:value="hlnBorderLayout"/> <dlg:fixedline dlg:id="hlnArrangements" dlg:tab-index="15" dlg:left="6" dlg:top="39" dlg:width="137" dlg:height="8" dlg:page="2" dlg:value="hlnArrangements"/> <dlg:radiogroup> - <dlg:radio dlg:id="optAlign0" dlg:tab-index="28" dlg:left="12" dlg:top="154" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34441" dlg:value="optAlign0"> + <dlg:radio dlg:id="optAlign0" dlg:tab-index="28" dlg:left="12" dlg:top="154" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK1" dlg:value="optAlign0"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeLabelAlignments?language=Basic&location=application" script:language="Script"/> </dlg:radio> - <dlg:radio dlg:id="optAlign2" dlg:tab-index="29" dlg:left="12" dlg:top="168" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34442" dlg:value="optAlign2"> + <dlg:radio dlg:id="optAlign2" dlg:tab-index="29" dlg:left="12" dlg:top="168" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK1" dlg:value="optAlign2"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:FormWizard.Layouter.ChangeLabelAlignments?language=Basic&location=application" script:language="Script"/> </dlg:radio> </dlg:radiogroup> diff --git a/wizards/source/importwizard/ImportDialog.xdl b/wizards/source/importwizard/ImportDialog.xdl index 082c06bc8..f28bc1192 100644 --- a/wizards/source/importwizard/ImportDialog.xdl +++ b/wizards/source/importwizard/ImportDialog.xdl @@ -1,90 +1,90 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd"> -<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="ImportDialog" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="4" dlg:help-url="HID:34570" dlg:closeable="true" dlg:moveable="true" dlg:title="ImportDialog"> +<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="ImportDialog" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="4" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_DIALOG" dlg:closeable="true" dlg:moveable="true" dlg:title="ImportDialog"> <dlg:bulletinboard> <dlg:text dlg:id="lblTemplateExport" dlg:tab-index="0" dlg:left="12" dlg:top="94" dlg:width="60" dlg:height="8" dlg:page="2" dlg:value="lblTemplateExport"/> - <dlg:textfield dlg:id="txtTemplateImportPath" dlg:tab-index="1" dlg:left="73" dlg:top="76" dlg:width="170" dlg:height="12" dlg:page="2" dlg:help-url="HID:34583"> + <dlg:textfield dlg:id="txtTemplateImportPath" dlg:tab-index="1" dlg:left="73" dlg:top="76" dlg:width="170" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_LBTEMPLATEPATH"> <script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&location=application" script:language="Script"/> </dlg:textfield> - <dlg:textfield dlg:id="txtTemplateExportPath" dlg:tab-index="2" dlg:left="73" dlg:top="92" dlg:width="170" dlg:height="12" dlg:page="2" dlg:help-url="HID:34584"/> - <dlg:checkbox dlg:id="chkDocumentPath" dlg:tab-index="3" dlg:left="12" dlg:top="121" dlg:width="240" dlg:height="10" dlg:page="2" dlg:tag="Document" dlg:help-url="HID:34586" dlg:value="chkDocumentPath" dlg:checked="true"> + <dlg:textfield dlg:id="txtTemplateExportPath" dlg:tab-index="2" dlg:left="73" dlg:top="92" dlg:width="170" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_EDTEMPLATEPATH"/> + <dlg:checkbox dlg:id="chkDocumentPath" dlg:tab-index="3" dlg:left="12" dlg:top="121" dlg:width="240" dlg:height="10" dlg:page="2" dlg:tag="Document" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CBDOCUMENT" dlg:value="chkDocumentPath" dlg:checked="true"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.DialogModul.ToggleInputPaths?language=Basic&location=application" script:language="Script"/> </dlg:checkbox> - <dlg:checkbox dlg:id="chkDocumentSearchSubDir" dlg:tab-index="4" dlg:left="12" dlg:top="134" dlg:width="240" dlg:height="10" dlg:page="2" dlg:help-url="HID:34587" dlg:value="chkDocumentSearchSubDir" dlg:checked="false"/> + <dlg:checkbox dlg:id="chkDocumentSearchSubDir" dlg:tab-index="4" dlg:left="12" dlg:top="134" dlg:width="240" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CBDOCUMENTRECURSE" dlg:value="chkDocumentSearchSubDir" dlg:checked="false"/> <dlg:text dlg:id="lblDocumentImport" dlg:tab-index="5" dlg:left="10" dlg:top="151" dlg:width="60" dlg:height="8" dlg:page="2" dlg:value="lblDocumentImport"/> <dlg:text dlg:id="lblDocumentExport" dlg:tab-index="6" dlg:left="10" dlg:top="167" dlg:width="60" dlg:height="8" dlg:page="2" dlg:value="lblDocumentExport"/> - <dlg:textfield dlg:id="txtDocumentImportPath" dlg:tab-index="7" dlg:left="73" dlg:top="149" dlg:width="170" dlg:height="12" dlg:page="2" dlg:help-url="HID:34588"> + <dlg:textfield dlg:id="txtDocumentImportPath" dlg:tab-index="7" dlg:left="73" dlg:top="149" dlg:width="170" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_LBDOCUMENTPATH"> <script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&location=application" script:language="Script"/> </dlg:textfield> - <dlg:textfield dlg:id="txtDocumentExportPath" dlg:tab-index="8" dlg:left="73" dlg:top="165" dlg:width="170" dlg:height="12" dlg:page="2" dlg:help-url="HID:34589"/> + <dlg:textfield dlg:id="txtDocumentExportPath" dlg:tab-index="8" dlg:left="73" dlg:top="165" dlg:width="170" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_EDDOCUMENTPATH"/> <dlg:text dlg:id="SummaryHeaderLabel" dlg:tab-index="9" dlg:left="6" dlg:top="37" dlg:width="258" dlg:height="8" dlg:page="3" dlg:value="SummaryHeaderLabel"/> - <dlg:textfield dlg:id="SummaryTextbox" dlg:tab-index="10" dlg:left="5" dlg:top="48" dlg:width="259" dlg:height="125" dlg:page="3" dlg:help-url="HID:34595" dlg:vscroll="true" dlg:multiline="true" dlg:readonly="true"/> + <dlg:textfield dlg:id="SummaryTextbox" dlg:tab-index="10" dlg:left="5" dlg:top="48" dlg:width="259" dlg:height="125" dlg:page="3" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_3_TBSUMMARY" dlg:vscroll="true" dlg:multiline="true" dlg:readonly="true"/> <dlg:text dlg:id="LabelRetrieval" dlg:tab-index="11" dlg:left="10" dlg:top="67" dlg:width="255" dlg:height="8" dlg:page="4" dlg:value="LabelRetrieval"/> <dlg:text dlg:id="LabelCurTemplateRetrieval" dlg:tab-index="12" dlg:left="15" dlg:top="79" dlg:width="249" dlg:height="8" dlg:page="4" dlg:value="LabelCurTemplateRetrieval"/> <dlg:text dlg:id="LabelCurDocumentRetrieval" dlg:tab-index="13" dlg:left="15" dlg:top="91" dlg:width="249" dlg:height="8" dlg:page="4" dlg:value="LabelCurDocumentRetrieval"/> <dlg:text dlg:id="LabelCurProgress" dlg:tab-index="14" dlg:left="10" dlg:top="106" dlg:width="255" dlg:height="8" dlg:page="4" dlg:value="LabelCurProgress"/> <dlg:text dlg:id="LabelCurDocument" dlg:tab-index="15" dlg:left="15" dlg:top="118" dlg:width="249" dlg:height="20" dlg:page="4" dlg:value="LabelCurDocument" dlg:multiline="true"/> <dlg:img dlg:id="ImportPreview" dlg:tab-index="16" dlg:left="5" dlg:top="6" dlg:width="258" dlg:height="26" dlg:scale-image="false"/> - <dlg:button dlg:id="cmdBack" dlg:tab-index="17" dlg:left="155" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:34573" dlg:value="cmdBack"> + <dlg:button dlg:id="cmdBack" dlg:tab-index="17" dlg:left="155" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CMDPREV" dlg:value="cmdBack"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.Main.PrevStep?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdCancel" dlg:tab-index="18" dlg:left="6" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:34572" dlg:value="cmdCancel"> + <dlg:button dlg:id="cmdCancel" dlg:tab-index="18" dlg:left="6" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CMDCANCEL" dlg:value="cmdCancel"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.Main.CancelTask?language=Basic&location=application" script:language="Script"/> </dlg:button> <dlg:button dlg:id="cmdHelp" dlg:tab-index="19" dlg:left="65" dlg:top="190" dlg:width="50" dlg:height="14" dlg:value="cmdHelp" dlg:button-type="help"/> - <dlg:button dlg:id="cmdGoOn" dlg:tab-index="20" dlg:left="214" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:34574" dlg:value="cmdGoOn"> + <dlg:button dlg:id="cmdGoOn" dlg:tab-index="20" dlg:left="214" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CMDNEXT" dlg:value="cmdGoOn"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.Main.NextStep?language=Basic&location=application" script:language="Script"/> </dlg:button> <dlg:text dlg:id="WelcomeTextLabel" dlg:tab-index="21" dlg:left="6" dlg:top="38" dlg:width="258" dlg:height="20" dlg:page="1" dlg:value="WelcomeTextLabel" dlg:multiline="true"/> <dlg:text dlg:id="WelcomeTextLabel3" dlg:tab-index="22" dlg:left="6" dlg:top="58" dlg:width="258" dlg:height="12" dlg:page="1" dlg:value="WelcomeTextLabel3"/> - <dlg:button dlg:id="cmdTemplateImport" dlg:tab-index="23" dlg:left="248" dlg:top="75" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="txtTemplateImportPath" dlg:help-url="HID:34585" dlg:value="..."> + <dlg:button dlg:id="cmdTemplateImport" dlg:tab-index="23" dlg:left="248" dlg:top="75" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="txtTemplateImportPath" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT" dlg:value="..."> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.DialogModul.TakoverFolderName?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdTemplateExport" dlg:tab-index="24" dlg:left="248" dlg:top="91" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="txtTemplateExportPath" dlg:help-url="HID:34600" dlg:value="..."> + <dlg:button dlg:id="cmdTemplateExport" dlg:tab-index="24" dlg:left="248" dlg:top="91" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="txtTemplateExportPath" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2" dlg:value="..."> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.DialogModul.TakoverFolderName?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdDocumentImport" dlg:tab-index="25" dlg:left="248" dlg:top="148" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="txtDocumentImportPath" dlg:help-url="HID:34590" dlg:value="..."> + <dlg:button dlg:id="cmdDocumentImport" dlg:tab-index="25" dlg:left="248" dlg:top="148" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="txtDocumentImportPath" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT" dlg:value="..."> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.DialogModul.TakoverFolderName?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdDocumentExport" dlg:tab-index="26" dlg:left="248" dlg:top="164" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="txtDocumentExportPath" dlg:help-url="HID:34601" dlg:value="..."> + <dlg:button dlg:id="cmdDocumentExport" dlg:tab-index="26" dlg:left="248" dlg:top="164" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="txtDocumentExportPath" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2" dlg:value="..."> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.DialogModul.TakoverFolderName?language=Basic&location=application" script:language="Script"/> </dlg:button> <dlg:radiogroup> - <dlg:radio dlg:id="optSODocuments" dlg:tab-index="27" dlg:left="6" dlg:top="72" dlg:width="258" dlg:height="9" dlg:page="1" dlg:tag="SO" dlg:help-url="HID:34575" dlg:value="optSODocuments" dlg:checked="true"> + <dlg:radio dlg:id="optSODocuments" dlg:tab-index="27" dlg:left="6" dlg:top="72" dlg:width="258" dlg:height="9" dlg:page="1" dlg:tag="SO" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_OPTSODOCUMENTS" dlg:value="optSODocuments" dlg:checked="true"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleCheckboxes?language=Basic&location=application" script:language="Script"/> </dlg:radio> - <dlg:radio dlg:id="optMSDocuments" dlg:tab-index="28" dlg:left="6" dlg:top="113" dlg:width="258" dlg:height="9" dlg:page="1" dlg:tag="MS" dlg:help-url="HID:34576" dlg:value="optMSDocuments"> + <dlg:radio dlg:id="optMSDocuments" dlg:tab-index="28" dlg:left="6" dlg:top="113" dlg:width="258" dlg:height="9" dlg:page="1" dlg:tag="MS" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_OPTMSDOCUMENTS" dlg:value="optMSDocuments"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleCheckboxes?language=Basic&location=application" script:language="Script"/> </dlg:radio> </dlg:radiogroup> - <dlg:checkbox dlg:id="chkSOApplication1" dlg:tab-index="29" dlg:left="12" dlg:top="85" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:34596" dlg:value="chkSOApplication1" dlg:checked="false"> + <dlg:checkbox dlg:id="chkSOApplication1" dlg:tab-index="29" dlg:left="12" dlg:top="85" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CHKWRITER" dlg:value="chkSOApplication1" dlg:checked="false"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&location=application" script:language="Script"/> </dlg:checkbox> - <dlg:checkbox dlg:id="chkSOApplication2" dlg:tab-index="30" dlg:left="155" dlg:top="85" dlg:width="109" dlg:height="9" dlg:page="1" dlg:help-url="HID:34597" dlg:value="chkSOApplication2" dlg:checked="false"> + <dlg:checkbox dlg:id="chkSOApplication2" dlg:tab-index="30" dlg:left="155" dlg:top="85" dlg:width="109" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CHKCALC" dlg:value="chkSOApplication2" dlg:checked="false"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&location=application" script:language="Script"/> </dlg:checkbox> - <dlg:checkbox dlg:id="chkSOApplication3" dlg:tab-index="31" dlg:left="12" dlg:top="98" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:34598" dlg:value="chkSOApplication3" dlg:checked="false"> + <dlg:checkbox dlg:id="chkSOApplication3" dlg:tab-index="31" dlg:left="12" dlg:top="98" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CHKIMPRESS" dlg:value="chkSOApplication3" dlg:checked="false"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&location=application" script:language="Script"/> </dlg:checkbox> - <dlg:checkbox dlg:id="chkSOApplication4" dlg:tab-index="32" dlg:left="155" dlg:top="98" dlg:width="109" dlg:height="9" dlg:page="1" dlg:help-url="HID:34599" dlg:value="chkSOApplication4" dlg:checked="false"> + <dlg:checkbox dlg:id="chkSOApplication4" dlg:tab-index="32" dlg:left="155" dlg:top="98" dlg:width="109" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CHKMATHGLOBAL" dlg:value="chkSOApplication4" dlg:checked="false"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&location=application" script:language="Script"/> </dlg:checkbox> - <dlg:checkbox dlg:id="chkMSApplication1" dlg:tab-index="33" dlg:disabled="true" dlg:left="12" dlg:top="126" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:34578" dlg:value="chkMSApplication1" dlg:checked="false"> + <dlg:checkbox dlg:id="chkMSApplication1" dlg:tab-index="33" dlg:disabled="true" dlg:left="12" dlg:top="126" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CHKWORD" dlg:value="chkMSApplication1" dlg:checked="false"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&location=application" script:language="Script"/> </dlg:checkbox> - <dlg:checkbox dlg:id="chkMSApplication2" dlg:tab-index="34" dlg:disabled="true" dlg:left="155" dlg:top="126" dlg:width="109" dlg:height="9" dlg:page="1" dlg:help-url="HID:34579" dlg:value="chkMSApplication2" dlg:checked="false"> + <dlg:checkbox dlg:id="chkMSApplication2" dlg:tab-index="34" dlg:disabled="true" dlg:left="155" dlg:top="126" dlg:width="109" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CHKEXCEL" dlg:value="chkMSApplication2" dlg:checked="false"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&location=application" script:language="Script"/> </dlg:checkbox> - <dlg:checkbox dlg:id="chkMSApplication3" dlg:tab-index="35" dlg:disabled="true" dlg:left="12" dlg:top="139" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:34580" dlg:value="chkMSApplication3" dlg:checked="false"> + <dlg:checkbox dlg:id="chkMSApplication3" dlg:tab-index="35" dlg:disabled="true" dlg:left="12" dlg:top="139" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CHKPOWERPOINT" dlg:value="chkMSApplication3" dlg:checked="false"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&location=application" script:language="Script"/> </dlg:checkbox> <dlg:text dlg:id="WelcomeTextLabel2" dlg:tab-index="36" dlg:disabled="true" dlg:left="6" dlg:top="152" dlg:width="258" dlg:height="18" dlg:page="1" dlg:value="WelcomeTextLabel2" dlg:multiline="true"/> - <dlg:checkbox dlg:id="chkTemplatePath" dlg:tab-index="37" dlg:left="12" dlg:top="48" dlg:width="240" dlg:height="10" dlg:page="2" dlg:tag="Template" dlg:help-url="HID:34581" dlg:value="chkTemplatePath" dlg:checked="true"> + <dlg:checkbox dlg:id="chkTemplatePath" dlg:tab-index="37" dlg:left="12" dlg:top="48" dlg:width="240" dlg:height="10" dlg:page="2" dlg:tag="Template" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATE" dlg:value="chkTemplatePath" dlg:checked="true"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.DialogModul.ToggleInputPaths?language=Basic&location=application" script:language="Script"/> </dlg:checkbox> - <dlg:checkbox dlg:id="chkTemplateSearchSubDir" dlg:tab-index="38" dlg:left="12" dlg:top="61" dlg:width="240" dlg:height="10" dlg:page="2" dlg:help-url="HID:34582" dlg:value="chkTemplateSearchSubDir" dlg:checked="false"/> + <dlg:checkbox dlg:id="chkTemplateSearchSubDir" dlg:tab-index="38" dlg:left="12" dlg:top="61" dlg:width="240" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATERECURSE" dlg:value="chkTemplateSearchSubDir" dlg:checked="false"/> <dlg:text dlg:id="lblTemplateImport" dlg:tab-index="39" dlg:left="12" dlg:top="78" dlg:width="60" dlg:height="8" dlg:page="2" dlg:value="lblTemplateImport"/> - <dlg:checkbox dlg:id="chkLogfile" dlg:tab-index="40" dlg:left="6" dlg:top="171" dlg:width="136" dlg:height="9" dlg:page="1" dlg:help-url="HID:34577" dlg:value="chkLogfile" dlg:checked="true"/> + <dlg:checkbox dlg:id="chkLogfile" dlg:tab-index="40" dlg:left="6" dlg:top="171" dlg:width="136" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CHKLOGFILE" dlg:value="chkLogfile" dlg:checked="true"/> <dlg:fixedline dlg:id="hlnTemplates" dlg:tab-index="41" dlg:left="6" dlg:top="37" dlg:width="258" dlg:height="8" dlg:page="2" dlg:value="hlnTemplates"/> <dlg:fixedline dlg:id="hlnDocuments" dlg:tab-index="42" dlg:left="6" dlg:top="110" dlg:width="258" dlg:height="8" dlg:page="2" dlg:value="hlnDocuments"/> <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="43" dlg:left="6" dlg:top="181" dlg:width="258" dlg:height="6"/> diff --git a/wizards/source/schedule/DlgCalendar.xdl b/wizards/source/schedule/DlgCalendar.xdl index 7f1b68d89..2936a5ebe 100644 --- a/wizards/source/schedule/DlgCalendar.xdl +++ b/wizards/source/schedule/DlgCalendar.xdl @@ -1,64 +1,64 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd"> -<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog1" dlg:left="160" dlg:top="81" dlg:width="208" dlg:height="156" dlg:page="1" dlg:help-url="HID:34700" dlg:closeable="true" dlg:moveable="true"> +<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog1" dlg:left="160" dlg:top="81" dlg:width="208" dlg:height="156" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_DIALOG" dlg:closeable="true" dlg:moveable="true"> <dlg:styles> <dlg:style dlg:style-id="0" dlg:border="none"/> <dlg:style dlg:style-id="1" dlg:font-name="Cumberland" dlg:font-stylename="Standard" dlg:font-family="modern" dlg:font-charset="ansi"/> <dlg:style dlg:style-id="2" dlg:font-name="Cumberland" dlg:font-stylename="Standard" dlg:font-family="modern" dlg:font-charset="ansi"/> </dlg:styles> <dlg:bulletinboard> - <dlg:menulist dlg:id="lstHolidays" dlg:tab-index="0" dlg:left="6" dlg:top="17" dlg:width="95" dlg:height="12" dlg:page="1" dlg:help-url="HID:34708" dlg:spin="true"/> + <dlg:menulist dlg:id="lstHolidays" dlg:tab-index="0" dlg:left="6" dlg:top="17" dlg:width="95" dlg:height="12" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_1_CMBSTATE" dlg:spin="true"/> <dlg:fixedline dlg:id="hlnCalendar" dlg:tab-index="1" dlg:left="6" dlg:top="36" dlg:width="95" dlg:height="8" dlg:page="1" dlg:value="hlnCalendar"/> <dlg:radiogroup> - <dlg:radio dlg:id="optYear" dlg:tab-index="2" dlg:left="12" dlg:top="47" dlg:width="81" dlg:height="10" dlg:page="1" dlg:help-url="HID:34702" dlg:value="optYear"> + <dlg:radio dlg:id="optYear" dlg:tab-index="2" dlg:left="12" dlg:top="47" dlg:width="81" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_1_OPYEAR" dlg:value="optYear"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Schedule.CalendarMain.CalChooseCalendar?language=Basic&location=application" script:language="Script"/> </dlg:radio> - <dlg:radio dlg:id="optMonth" dlg:tab-index="3" dlg:left="12" dlg:top="61" dlg:width="81" dlg:height="10" dlg:page="1" dlg:help-url="HID:34703" dlg:value="optMonth"> + <dlg:radio dlg:id="optMonth" dlg:tab-index="3" dlg:left="12" dlg:top="61" dlg:width="81" dlg:height="10" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_1_OPMONTH" dlg:value="optMonth"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Schedule.CalendarMain.CalChooseCalendar?language=Basic&location=application" script:language="Script"/> </dlg:radio> </dlg:radiogroup> <dlg:text dlg:id="lblHolidays" dlg:tab-index="4" dlg:left="6" dlg:top="6" dlg:width="96" dlg:height="8" dlg:page="1" dlg:value="lblHolidays"/> - <dlg:img dlg:style-id="0" dlg:id="imgCountry" dlg:tab-index="5" dlg:left="106" dlg:top="6" dlg:width="95" dlg:height="113" dlg:page="1" dlg:help-url="HID:34701"> + <dlg:img dlg:style-id="0" dlg:id="imgCountry" dlg:tab-index="5" dlg:left="106" dlg:top="6" dlg:width="95" dlg:height="113" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_1_PREVIEW"> <script:event script:event-name="on-mousedown" script:macro-name="vnd.sun.star.script:Schedule.DlgControl.SelectState?language=Basic&location=application" script:language="Script"/> <script:event script:event-name="on-mouseout" script:macro-name="vnd.sun.star.script:Schedule.DlgControl.MouseLeavesImage?language=Basic&location=application" script:language="Script"/> <script:event script:event-name="on-mousemove" script:macro-name="vnd.sun.star.script:Schedule.DlgControl.CalMouseMoved?language=Basic&location=application" script:language="Script"/> </dlg:img> <dlg:fixedline dlg:id="hlnTime" dlg:tab-index="6" dlg:left="5" dlg:top="78" dlg:width="95" dlg:height="8" dlg:page="1" dlg:value="hlnTime"/> - <dlg:menulist dlg:id="lstMonth" dlg:tab-index="7" dlg:left="62" dlg:top="106" dlg:width="38" dlg:height="12" dlg:page="1" dlg:help-url="HID:34705" dlg:spin="true"/> + <dlg:menulist dlg:id="lstMonth" dlg:tab-index="7" dlg:left="62" dlg:top="106" dlg:width="38" dlg:height="12" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_1_EDMONTH" dlg:spin="true"/> <dlg:text dlg:id="lblYear" dlg:tab-index="8" dlg:left="12" dlg:top="91" dlg:width="46" dlg:height="8" dlg:page="1" dlg:value="lblYear"/> <dlg:text dlg:id="lblMonth" dlg:tab-index="9" dlg:left="12" dlg:top="108" dlg:width="46" dlg:height="8" dlg:page="1" dlg:value="lblMonth"/> <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="10" dlg:left="6" dlg:top="125" dlg:width="196" dlg:height="4"/> - <dlg:button dlg:id="cmdCancel" dlg:tab-index="11" dlg:left="6" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:34721" dlg:value="cmdCancel"> + <dlg:button dlg:id="cmdCancel" dlg:tab-index="11" dlg:left="6" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDCANCEL" dlg:value="cmdCancel"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Schedule.CalendarMain.CalcmdCancel?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdOwnData" dlg:tab-index="12" dlg:left="99" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:34720" dlg:value="cmdOwnData"> + <dlg:button dlg:id="cmdOwnData" dlg:tab-index="12" dlg:left="99" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOWNDATA" dlg:value="cmdOwnData"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Schedule.DlgControl.CalmdSwitchOwnDataOrGeneral?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdGoOn" dlg:tab-index="13" dlg:left="152" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:34722" dlg:value="cmdGoOn"> + <dlg:button dlg:id="cmdGoOn" dlg:tab-index="13" dlg:left="152" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOK" dlg:value="cmdGoOn"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Schedule.CalendarMain.CalcmdOk?language=Basic&location=application" script:language="Script"/> </dlg:button> <dlg:text dlg:id="lblEvent" dlg:tab-index="14" dlg:left="12" dlg:top="17" dlg:width="67" dlg:height="8" dlg:page="2" dlg:value="lblEvent"/> <dlg:fixedline dlg:id="hlnNewEvent" dlg:tab-index="15" dlg:left="6" dlg:top="6" dlg:width="196" dlg:height="8" dlg:page="2" dlg:value="hlnNewEvent"/> - <dlg:textfield dlg:style-id="1" dlg:id="txtEvent" dlg:tab-index="16" dlg:left="12" dlg:top="28" dlg:width="107" dlg:height="12" dlg:page="2" dlg:help-url="HID:34712"> + <dlg:textfield dlg:style-id="1" dlg:id="txtEvent" dlg:tab-index="16" dlg:left="12" dlg:top="28" dlg:width="107" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENT"> <script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:Schedule.OwnEvents.CheckInsertedDates?language=Basic&location=application" script:language="Script"/> </dlg:textfield> - <dlg:numericfield dlg:id="txtOwnEventDay" dlg:tab-index="17" dlg:left="13" dlg:top="55" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:34714" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:spin="true"> + <dlg:numericfield dlg:id="txtOwnEventDay" dlg:tab-index="17" dlg:left="13" dlg:top="55" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTDAY" dlg:decimal-accuracy="0" dlg:value-min="1" dlg:spin="true"> <script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:Schedule.OwnEvents.CheckInsertedDates?language=Basic&location=application" script:language="Script"/> </dlg:numericfield> - <dlg:menulist dlg:id="lstOwnEventMonth" dlg:tab-index="18" dlg:left="60" dlg:top="55" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:34716" dlg:spin="true"> + <dlg:menulist dlg:id="lstOwnEventMonth" dlg:tab-index="18" dlg:left="60" dlg:top="55" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTMONTH" dlg:spin="true"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Schedule.OwnEvents.GetOwnMonth?language=Basic&location=application" script:language="Script"/> </dlg:menulist> - <dlg:button dlg:id="cmdInsert" dlg:tab-index="19" dlg:left="99" dlg:top="70" dlg:width="50" dlg:height="14" dlg:page="2" dlg:help-url="HID:34710" dlg:value="cmdInsert"> + <dlg:button dlg:id="cmdInsert" dlg:tab-index="19" dlg:left="99" dlg:top="70" dlg:width="50" dlg:height="14" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_2_CMDINSERT" dlg:value="cmdInsert"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Schedule.OwnEvents.CalcmdInsertData?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdDelete" dlg:tab-index="20" dlg:left="152" dlg:top="70" dlg:width="50" dlg:height="14" dlg:page="2" dlg:help-url="HID:34711" dlg:value="cmdDelete"> + <dlg:button dlg:id="cmdDelete" dlg:tab-index="20" dlg:left="152" dlg:top="70" dlg:width="50" dlg:height="14" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_2_CMDDELETE" dlg:value="cmdDelete"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Schedule.DlgControl.CalcmdDeleteSelect?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:menulist dlg:style-id="2" dlg:id="lstOwnData" dlg:tab-index="21" dlg:left="12" dlg:top="86" dlg:width="190" dlg:height="34" dlg:page="2" dlg:help-url="HID:34709"> + <dlg:menulist dlg:style-id="2" dlg:id="lstOwnData" dlg:tab-index="21" dlg:left="12" dlg:top="86" dlg:width="190" dlg:height="34" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_2_LBOWNDATA"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Schedule.DlgControl.CalUpdateNewEventFrame?language=Basic&location=application" script:language="Script"/> </dlg:menulist> <dlg:text dlg:id="lblEventDay" dlg:tab-index="22" dlg:left="12" dlg:top="44" dlg:width="44" dlg:height="8" dlg:page="2" dlg:value="lblEventDay"/> <dlg:text dlg:id="lblEventMonth" dlg:tab-index="23" dlg:left="60" dlg:top="44" dlg:width="44" dlg:height="8" dlg:page="2" dlg:value="lblEventMonth"/> - <dlg:numericfield dlg:id="txtYear" dlg:tab-index="24" dlg:left="62" dlg:top="89" dlg:width="38" dlg:height="12" dlg:page="1" dlg:help-url="HID:34704" dlg:decimal-accuracy="0" dlg:value-min="1582" dlg:value-max="9957" dlg:spin="true"/> + <dlg:numericfield dlg:id="txtYear" dlg:tab-index="24" dlg:left="62" dlg:top="89" dlg:width="38" dlg:height="12" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGHOLIDAYCAL_1_EDYEAR" dlg:decimal-accuracy="0" dlg:value-min="1582" dlg:value-max="9957" dlg:spin="true"/> </dlg:bulletinboard> </dlg:window>
\ No newline at end of file diff --git a/wizards/source/template/DialogStyles.xdl b/wizards/source/template/DialogStyles.xdl index a28beb14c..35042849c 100644 --- a/wizards/source/template/DialogStyles.xdl +++ b/wizards/source/template/DialogStyles.xdl @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd"> -<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DialogStyles" dlg:left="170" dlg:top="93" dlg:width="120" dlg:height="169" dlg:help-url="HID:34650" dlg:closeable="true" dlg:moveable="true"> +<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DialogStyles" dlg:left="170" dlg:top="93" dlg:width="120" dlg:height="169" dlg:help-url="HID:WIZARDS_HID_DLGSTYLES_DIALOG" dlg:closeable="true" dlg:moveable="true"> <dlg:bulletinboard> - <dlg:button dlg:id="cmdCancel" dlg:tab-index="0" dlg:left="5" dlg:top="150" dlg:width="50" dlg:height="13" dlg:help-url="HID:34652" dlg:value="cmdCancel"> + <dlg:button dlg:id="cmdCancel" dlg:tab-index="0" dlg:left="5" dlg:top="150" dlg:width="50" dlg:height="13" dlg:help-url="HID:WIZARDS_HID_DLGSTYLES_CANCEL" dlg:value="cmdCancel"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Template.Samples.RestoreCurrentStyles?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:button dlg:id="cmdOk" dlg:tab-index="1" dlg:left="65" dlg:top="150" dlg:width="50" dlg:height="12" dlg:help-url="HID:34653" dlg:value="cmdOk"> + <dlg:button dlg:id="cmdOk" dlg:tab-index="1" dlg:left="65" dlg:top="150" dlg:width="50" dlg:height="12" dlg:help-url="HID:WIZARDS_HID_DLGSTYLES_OKAY" dlg:value="cmdOk"> <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Template.Samples.CloseStyleDialog?language=Basic&location=application" script:language="Script"/> </dlg:button> - <dlg:menulist dlg:id="lbStyles" dlg:tab-index="2" dlg:left="5" dlg:top="5" dlg:width="110" dlg:height="133" dlg:help-url="HID:34651"> + <dlg:menulist dlg:id="lbStyles" dlg:tab-index="2" dlg:left="5" dlg:top="5" dlg:width="110" dlg:height="133" dlg:help-url="HID:WIZARDS_HID_DLGSTYLES_LISTBOX"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Template.Samples.SelectStyle?language=Basic&location=application" script:language="Script"/> </dlg:menulist> </dlg:bulletinboard> diff --git a/wizards/source/template/TemplateDialog.xdl b/wizards/source/template/TemplateDialog.xdl index eb4cc6969..4b8633f23 100644 --- a/wizards/source/template/TemplateDialog.xdl +++ b/wizards/source/template/TemplateDialog.xdl @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd"> -<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="TemplateDialog" dlg:left="170" dlg:top="93" dlg:width="220" dlg:height="60" dlg:page="1" dlg:help-url="HID:34630" dlg:closeable="true" dlg:moveable="true"> +<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="TemplateDialog" dlg:left="170" dlg:top="93" dlg:width="220" dlg:height="60" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCORRESPONDENCE_DIALOG" dlg:closeable="true" dlg:moveable="true"> <dlg:bulletinboard> <dlg:radiogroup> - <dlg:radio dlg:id="OptAgenda1" dlg:tab-index="0" dlg:left="12" dlg:top="20" dlg:width="144" dlg:height="10" dlg:page="1" dlg:tag="TOP2;PT1" dlg:help-url="HID:34632" dlg:value="OptAgenda1"> + <dlg:radio dlg:id="OptAgenda1" dlg:tab-index="0" dlg:left="12" dlg:top="20" dlg:width="144" dlg:height="10" dlg:page="1" dlg:tag="TOP2;PT1" dlg:help-url="HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA1" dlg:value="OptAgenda1"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Template.ModuleAgenda.GetOptionValues?language=Basic&location=application" script:language="Script"/> </dlg:radio> - <dlg:radio dlg:id="OptAgenda2" dlg:tab-index="1" dlg:left="12" dlg:top="34" dlg:width="144" dlg:height="10" dlg:page="1" dlg:tag="TOP1;PT2" dlg:help-url="HID:34633" dlg:value="OptAgenda2"> + <dlg:radio dlg:id="OptAgenda2" dlg:tab-index="1" dlg:left="12" dlg:top="34" dlg:width="144" dlg:height="10" dlg:page="1" dlg:tag="TOP1;PT2" dlg:help-url="HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA2" dlg:value="OptAgenda2"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:Template.ModuleAgenda.GetOptionValues?language=Basic&location=application" script:language="Script"/> </dlg:radio> </dlg:radiogroup> - <dlg:button dlg:id="CmdCorrGoOn" dlg:tab-index="2" dlg:left="164" dlg:top="11" dlg:width="50" dlg:height="14" dlg:page="2" dlg:help-url="HID:34637" dlg:value="CmdCorrGoOn"> + <dlg:button dlg:id="CmdCorrGoOn" dlg:tab-index="2" dlg:left="164" dlg:top="11" dlg:width="50" dlg:height="14" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCORRESPONDENCE_LETTEROKAY" dlg:value="CmdCorrGoOn"> <script:event script:event-name="on-performaction" script:macro-name="Template.Correspondence.OK" script:language="StarBasic"/> </dlg:button> <dlg:radiogroup> - <dlg:radio dlg:id="OptSingle" dlg:tab-index="3" dlg:left="12" dlg:top="20" dlg:width="144" dlg:height="10" dlg:page="2" dlg:help-url="HID:34635" dlg:value="OptSingle"/> - <dlg:radio dlg:id="Optmerge" dlg:tab-index="4" dlg:left="12" dlg:top="34" dlg:width="144" dlg:height="10" dlg:page="2" dlg:help-url="HID:34636" dlg:value="Optmerge"/> + <dlg:radio dlg:id="OptSingle" dlg:tab-index="3" dlg:left="12" dlg:top="20" dlg:width="144" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER1" dlg:value="OptSingle"/> + <dlg:radio dlg:id="Optmerge" dlg:tab-index="4" dlg:left="12" dlg:top="34" dlg:width="144" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER2" dlg:value="Optmerge"/> </dlg:radiogroup> - <dlg:button dlg:id="CmdAgdGoon" dlg:tab-index="5" dlg:left="164" dlg:top="11" dlg:width="50" dlg:height="14" dlg:page="1" dlg:help-url="HID:34634" dlg:value="CmdAgdGoOn"> + <dlg:button dlg:id="CmdAgdGoon" dlg:tab-index="5" dlg:left="164" dlg:top="11" dlg:width="50" dlg:height="14" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGCORRESPONDENCE_AGENDAOKAY" dlg:value="CmdAgdGoOn"> <script:event script:event-name="on-performaction" script:macro-name="Template.ModuleAgenda.ModifyTemplate" script:language="StarBasic"/> </dlg:button> - <dlg:button dlg:id="CmdCancel" dlg:tab-index="6" dlg:left="164" dlg:top="28" dlg:width="50" dlg:height="14" dlg:help-url="HID:34631" dlg:value="CmdCancel" dlg:button-type="cancel"> + <dlg:button dlg:id="CmdCancel" dlg:tab-index="6" dlg:left="164" dlg:top="28" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID_DLGCORRESPONDENCE_CANCEL" dlg:value="CmdCancel" dlg:button-type="cancel"> <script:event script:event-name="on-performaction" script:macro-name="Template.ModuleAgenda.DisposeDocument" script:language="StarBasic"/> </dlg:button> <dlg:fixedline dlg:id="FrmLetter" dlg:tab-index="7" dlg:left="6" dlg:top="6" dlg:width="150" dlg:height="10" dlg:page="2" dlg:value="FrmLetter"/> diff --git a/wizards/source/webwizard/WebWzrd.xdl b/wizards/source/webwizard/WebWzrd.xdl index be1bec77e..ac826e242 100644 --- a/wizards/source/webwizard/WebWzrd.xdl +++ b/wizards/source/webwizard/WebWzrd.xdl @@ -1,25 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd"> -<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="WebWzrd" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:help-url="HID:34200" dlg:closeable="true" dlg:moveable="true"> +<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="WebWzrd" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:help-url="HID:WIZARDS_HID0_WEBWIZARD" dlg:closeable="true" dlg:moveable="true"> <dlg:bulletinboard> - <dlg:button dlg:id="cbCancel" dlg:tab-index="0" dlg:left="6" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:34206" dlg:value="Cancel" dlg:button-type="cancel"/> - <dlg:button dlg:id="cbHelp" dlg:tab-index="1" dlg:left="66" dlg:top="190" dlg:width="50" dlg:height="14" dlg:tag="HID:34200" dlg:value="cbHelp" dlg:button-type="help"/> - <dlg:button dlg:id="cbGoOn" dlg:tab-index="2" dlg:left="214" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:34205" dlg:default="true" dlg:value="cbGoOn" dlg:button-type="ok"/> + <dlg:button dlg:id="cbCancel" dlg:tab-index="0" dlg:left="6" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID0_STATUS_DIALOG" dlg:value="Cancel" dlg:button-type="cancel"/> + <dlg:button dlg:id="cbHelp" dlg:tab-index="1" dlg:left="66" dlg:top="190" dlg:width="50" dlg:height="14" dlg:tag="HID:WIZARDS_HID0_WEBWIZARD" dlg:value="cbHelp" dlg:button-type="help"/> + <dlg:button dlg:id="cbGoOn" dlg:tab-index="2" dlg:left="214" dlg:top="190" dlg:width="50" dlg:height="14" dlg:help-url="HID:WIZARDS_HID0_CANCEL" dlg:default="true" dlg:value="cbGoOn" dlg:button-type="ok"/> <dlg:img dlg:id="ImagePreview" dlg:tab-index="3" dlg:left="6" dlg:top="6" dlg:width="258" dlg:height="26" dlg:scale-image="false"/> - <dlg:menulist dlg:id="lbTemplate" dlg:tab-index="4" dlg:left="6" dlg:top="53" dlg:width="110" dlg:height="94" dlg:help-url="HID:34201"> + <dlg:menulist dlg:id="lbTemplate" dlg:tab-index="4" dlg:left="6" dlg:top="53" dlg:width="110" dlg:height="94" dlg:help-url="HID:WIZARDS_HID0_HELP"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:WebWizard.HtmlAutoPilotBasic.ReloadCurrentDocument?language=Basic&location=application" script:language="Script"/> </dlg:menulist> - <dlg:menulist dlg:id="lbStyles" dlg:tab-index="5" dlg:left="154" dlg:top="53" dlg:width="110" dlg:height="94" dlg:help-url="HID:34202"> + <dlg:menulist dlg:id="lbStyles" dlg:tab-index="5" dlg:left="154" dlg:top="53" dlg:width="110" dlg:height="94" dlg:help-url="HID:WIZARDS_HID0_NEXT"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:WebWizard.HtmlAutoPilotBasic.LoadWebPageStyles?language=Basic&location=application" script:language="Script"/> </dlg:menulist> <dlg:text dlg:id="lblTemplate" dlg:tab-index="6" dlg:left="6" dlg:top="42" dlg:width="110" dlg:height="10"/> <dlg:text dlg:id="lblStyle" dlg:tab-index="7" dlg:left="154" dlg:top="42" dlg:width="110" dlg:height="10" dlg:value="lblStyle"/> - <dlg:checkbox dlg:id="chkSaveasTemplate" dlg:tab-index="8" dlg:left="6" dlg:top="164" dlg:width="110" dlg:height="12" dlg:help-url="HID:34207" dlg:value="chkSaveasTemplate" dlg:checked="false"/> + <dlg:checkbox dlg:id="chkSaveasTemplate" dlg:tab-index="8" dlg:left="6" dlg:top="164" dlg:width="110" dlg:height="12" dlg:help-url="HID:WIZARDS_HID1_LST_SESSIONS" dlg:value="chkSaveasTemplate" dlg:checked="false"/> <dlg:radiogroup> <dlg:radio dlg:id="optTiled" dlg:tab-index="9" dlg:left="161" dlg:top="164" dlg:width="96" dlg:height="10" dlg:tag="11" dlg:help-url="HID:34208" dlg:value="optTiled" dlg:checked="true"> <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:WebWizard.Common.SetBackGraphicStyle?language=Basic&location=application" script:language="Script"/> </dlg:radio> - <dlg:radio dlg:id="optArea" dlg:tab-index="10" dlg:left="161" dlg:top="177" dlg:width="96" dlg:height="10" dlg:tag="10" dlg:help-url="HID:34209" dlg:value="optArea"> + <dlg:radio dlg:id="optArea" dlg:tab-index="10" dlg:left="161" dlg:top="177" dlg:width="96" dlg:height="10" dlg:tag="10" dlg:help-url="HID:WIZARDS_HID1_BTN_DEL_SES" dlg:value="optArea"> <script:event script:event-name="on-itemstatechange" script:location="application" script:macro-name="WebWizard.HtmlAutoPilotBasic.SetBackGraphicStyle" script:language="StarBasic"/> </dlg:radio> </dlg:radiogroup> diff --git a/wizards/util/helpids.h b/wizards/util/helpids.h new file mode 100644 index 000000000..c0376f962 --- /dev/null +++ b/wizards/util/helpids.h @@ -0,0 +1,859 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * 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 + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +//two ranges available: +//34200 - 34767 +//40768 - 42767 + +/* + * web wizard : 34200 - 34319 + * report wizard : 34320 - 34399 + * others to be listed... + * + * web wizard (cont.) : 41000 - 41050 + * agenda wizard : 41051 - 41099 + */ + + +// *************** +// WEB WIZARD +// 34200 - 34319 +// 41000 - 41050 +// *************** +//webwizardgeneralcontrols + +#define HID0_WEBWIZARD "WIZARDS_HID0_WEBWIZARD" +#define HID0_HELP "WIZARDS_HID0_HELP" +#define HID0_NEXT "WIZARDS_HID0_NEXT" +#define HID0_PREV "WIZARDS_HID0_PREV" +#define HID0_CREATE "WIZARDS_HID0_CREATE" +#define HID0_CANCEL "WIZARDS_HID0_CANCEL" +#define HID0_STATUS_DIALOG "WIZARDS_HID0_STATUS_DIALOG" + + +//step1 +#define HID1_LST_SESSIONS "WIZARDS_HID1_LST_SESSIONS" +#define HID1_BTN_DEL_SES "WIZARDS_HID1_BTN_DEL_SES" + +//step2 +#define HID2_LST_DOCS "WIZARDS_HID2_LST_DOCS" +#define HID2_BTN_ADD_DOC "WIZARDS_HID2_BTN_ADD_DOC" +#define HID2_BTN_REM_DOC "WIZARDS_HID2_BTN_REM_DOC" +#define HID2_BTN_DOC_UP "WIZARDS_HID2_BTN_DOC_UP" +#define HID2_BTN_DOC_DOWN "WIZARDS_HID2_BTN_DOC_DOWN" +#define HID2_TXT_DOC_TITLE "WIZARDS_HID2_TXT_DOC_TITLE" +#define HID2_TXT_DOC_DESC "WIZARDS_HID2_TXT_DOC_DESC" +#define HID2_TXT_DOC_AUTHOR "WIZARDS_HID2_TXT_DOC_AUTHOR" +#define HID2_LST_DOC_EXPORT "WIZARDS_HID2_LST_DOC_EXPORT" +#define HID2_STATUS_ADD_DOCS "WIZARDS_HID2_STATUS_ADD_DOCS" + +//step3 +#define HID3_IL_LAYOUTS_IMG1 "WIZARDS_HID3_IL_LAYOUTS_IMG1" +#define HID3_IL_LAYOUTS_IMG2 "WIZARDS_HID3_IL_LAYOUTS_IMG2" +#define HID3_IL_LAYOUTS_IMG3 "WIZARDS_HID3_IL_LAYOUTS_IMG3" +#define HID3_IL_LAYOUTS_IMG4 "WIZARDS_HID3_IL_LAYOUTS_IMG4" +#define HID3_IL_LAYOUTS_IMG5 "WIZARDS_HID3_IL_LAYOUTS_IMG5" +#define HID3_IL_LAYOUTS_IMG6 "WIZARDS_HID3_IL_LAYOUTS_IMG6" +#define HID3_IL_LAYOUTS_IMG7 "WIZARDS_HID3_IL_LAYOUTS_IMG7" +#define HID3_IL_LAYOUTS_IMG8 "WIZARDS_HID3_IL_LAYOUTS_IMG8" +#define HID3_IL_LAYOUTS_IMG9 "WIZARDS_HID3_IL_LAYOUTS_IMG9" +#define HID3_IL_LAYOUTS_IMG10 "WIZARDS_HID3_IL_LAYOUTS_IMG10" +#define HID3_IL_LAYOUTS_IMG11 "WIZARDS_HID3_IL_LAYOUTS_IMG11" +#define HID3_IL_LAYOUTS_IMG12 "WIZARDS_HID3_IL_LAYOUTS_IMG12" +#define HID3_IL_LAYOUTS_IMG13 "WIZARDS_HID3_IL_LAYOUTS_IMG13" +#define HID3_IL_LAYOUTS_IMG14 "WIZARDS_HID3_IL_LAYOUTS_IMG14" +#define HID3_IL_LAYOUTS_IMG15 "WIZARDS_HID3_IL_LAYOUTS_IMG15" + +//step4 +#define HID4_CHK_DISPLAY_FILENAME "WIZARDS_HID4_CHK_DISPLAY_FILENAME" +#define HID4_CHK_DISPLAY_DESCRIPTION "WIZARDS_HID4_CHK_DISPLAY_DESCRIPTION" +#define HID4_CHK_DISPLAY_AUTHOR "WIZARDS_HID4_CHK_DISPLAY_AUTHOR" +#define HID4_CHK_DISPLAY_CR_DATE "WIZARDS_HID4_CHK_DISPLAY_CR_DATE" +#define HID4_CHK_DISPLAY_UP_DATE "WIZARDS_HID4_CHK_DISPLAY_UP_DATE" +#define HID4_CHK_DISPLAY_FORMAT "WIZARDS_HID4_CHK_DISPLAY_FORMAT" +#define HID4_CHK_DISPLAY_F_ICON "WIZARDS_HID4_CHK_DISPLAY_F_ICON" +#define HID4_CHK_DISPLAY_PAGES "WIZARDS_HID4_CHK_DISPLAY_PAGES" +#define HID4_CHK_DISPLAY_SIZE "WIZARDS_HID4_CHK_DISPLAY_SIZE" + +#define HID4_GRP_OPTIMAIZE_640 "WIZARDS_HID4_GRP_OPTIMAIZE_640" +#define HID4_GRP_OPTIMAIZE_800 "WIZARDS_HID4_GRP_OPTIMAIZE_800" +#define HID4_GRP_OPTIMAIZE_1024 "WIZARDS_HID4_GRP_OPTIMAIZE_1024" + + +//step5 +#define HID5_LST_STYLES "WIZARDS_HID5_LST_STYLES" +#define HID5_BTN_BACKGND "WIZARDS_HID5_BTN_BACKGND" +#define HID5_BTN_ICONS "WIZARDS_HID5_BTN_ICONS" + +//step6 +#define HID6_TXT_SITE_TITLE "WIZARDS_HID6_TXT_SITE_TITLE" +#define HID6_TXT_SITE_DESC "WIZARDS_HID6_TXT_SITE_DESC" +#define HID6_DATE_SITE_CREATED "WIZARDS_HID6_DATE_SITE_CREATED" +#define HID6_DATE_SITE_UPDATED "WIZARDS_HID6_DATE_SITE_UPDATED" +#define HID6_TXT_SITE_EMAIL "WIZARDS_HID6_TXT_SITE_EMAIL" +#define HID6_TXT_SITE_COPYRIGHT "WIZARDS_HID6_TXT_SITE_COPYRIGHT" + +//step7 +#define HID7_BTN_PREVIEW "WIZARDS_HID7_BTN_PREVIEW" +#define HID7_CHK_PUBLISH_LOCAL "WIZARDS_HID7_CHK_PUBLISH_LOCAL" +#define HID7_TXT_LOCAL "WIZARDS_HID7_TXT_LOCAL" +#define HID7_BTN_LOCAL "WIZARDS_HID7_BTN_LOCAL" +#define HID7_CHK_PUBLISH_ZIP "WIZARDS_HID7_CHK_PUBLISH_ZIP" +#define HID7_TXT_ZIP "WIZARDS_HID7_TXT_ZIP" +#define HID7_BTN_ZIP "WIZARDS_HID7_BTN_ZIP" +#define HID7_CHK_PUBLISH_FTP "WIZARDS_HID7_CHK_PUBLISH_FTP" +#define HID7_TXT_FTP "WIZARDS_HID7_TXT_FTP" +#define HID7_BTN_FTP "WIZARDS_HID7_BTN_FTP" +#define HID7_CHK_SAVE "WIZARDS_HID7_CHK_SAVE" +#define HID7_TXT_SAVE "WIZARDS_HID7_TXT_SAVE" + +//web wizard backgrounds dialog +#define HID_BG "WIZARDS_HID_BG" +#define HID_BG_BTN_OTHER "WIZARDS_HID_BG_BTN_OTHER" +#define HID_BG_BTN_NONE "WIZARDS_HID_BG_BTN_NONE" +#define HID_BG_BTN_OK "WIZARDS_HID_BG_BTN_OK" +#define HID_BG_BTN_CANCEL "WIZARDS_HID_BG_BTN_CANCEL" + +#define HID_BG_BTN_BACK "WIZARDS_HID_BG_BTN_BACK" +#define HID_BG_BTN_FW "WIZARDS_HID_BG_BTN_FW" +#define HID_BG_BTN_IMG1 "WIZARDS_HID_BG_BTN_IMG1" +#define HID_BG_BTN_IMG2 "WIZARDS_HID_BG_BTN_IMG2" +#define HID_BG_BTN_IMG3 "WIZARDS_HID_BG_BTN_IMG3" +#define HID_BG_BTN_IMG4 "WIZARDS_HID_BG_BTN_IMG4" +#define HID_BG_BTN_IMG5 "WIZARDS_HID_BG_BTN_IMG5" +#define HID_BG_BTN_IMG6 "WIZARDS_HID_BG_BTN_IMG6" +#define HID_BG_BTN_IMG7 "WIZARDS_HID_BG_BTN_IMG7" +#define HID_BG_BTN_IMG8 "WIZARDS_HID_BG_BTN_IMG8" +#define HID_BG_BTN_IMG9 "WIZARDS_HID_BG_BTN_IMG9" +#define HID_BG_BTN_IMG10 "WIZARDS_HID_BG_BTN_IMG10" +#define HID_BG_BTN_IMG11 "WIZARDS_HID_BG_BTN_IMG11" +#define HID_BG_BTN_IMG12 "WIZARDS_HID_BG_BTN_IMG12" +#define HID_BG_BTN_IMG13 "WIZARDS_HID_BG_BTN_IMG13" +#define HID_BG_BTN_IMG14 "WIZARDS_HID_BG_BTN_IMG14" +#define HID_BG_BTN_IMG15 "WIZARDS_HID_BG_BTN_IMG15" +#define HID_BG_BTN_IMG16 "WIZARDS_HID_BG_BTN_IMG16" + +// ++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Note: Web Wizard continues on 41000 later in this file. +// ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + + +// ************* +// REPORT WIZARD +// ************* + +#define HID_DLGREPORT_DIALOG "WIZARDS_HID_DLGREPORT_DIALOG" +#define HID_DLGREPORT_0_CMDPREV "WIZARDS_HID_DLGREPORT_0_CMDPREV" +#define HID_DLGREPORT_0_CMDNEXT "WIZARDS_HID_DLGREPORT_0_CMDNEXT" +#define HID_DLGREPORT_0_CMDFINISH "WIZARDS_HID_DLGREPORT_0_CMDFINISH" +#define HID_DLGREPORT_0_CMDCANCEL "WIZARDS_HID_DLGREPORT_0_CMDCANCEL" + +#define HID_DLGREPORT_1_LBTABLES "WIZARDS_HID_DLGREPORT_1_LBTABLES" +#define HID_DLGREPORT_1_FIELDSAVAILABLE "WIZARDS_HID_DLGREPORT_1_FIELDSAVAILABLE" +#define HID_DLGREPORT_1_CMDMOVESELECTED "WIZARDS_HID_DLGREPORT_1_CMDMOVESELECTED" +#define HID_DLGREPORT_1_CMDMOVEALL "WIZARDS_HID_DLGREPORT_1_CMDMOVEALL" +#define HID_DLGREPORT_1_CMDREMOVESELECTED "WIZARDS_HID_DLGREPORT_1_CMDREMOVESELECTED" +#define HID_DLGREPORT_1_CMDREMOVEALL "WIZARDS_HID_DLGREPORT_1_CMDREMOVEALL" +#define HID_DLGREPORT_1_FIELDSSELECTED "WIZARDS_HID_DLGREPORT_1_FIELDSSELECTED" +#define HID_DLGREPORT_1_CMDMOVEUP "WIZARDS_HID_DLGREPORT_1_CMDMOVEUP" +#define HID_DLGREPORT_1_CMDMOVEDOWN "WIZARDS_HID_DLGREPORT_1_CMDMOVEDOWN" + + +#define HID_DLGREPORT_2_GROUPING "WIZARDS_HID_DLGREPORT_2_GROUPING" +#define HID_DLGREPORT_2_CMDGROUP "WIZARDS_HID_DLGREPORT_2_CMDGROUP" +#define HID_DLGREPORT_2_CMDUNGROUP "WIZARDS_HID_DLGREPORT_2_CMDUNGROUP" +#define HID_DLGREPORT_2_PREGROUPINGDEST "WIZARDS_HID_DLGREPORT_2_PREGROUPINGDEST" +#define HID_DLGREPORT_2_CMDMOVEUPGROUP "WIZARDS_HID_DLGREPORT_2_CMDMOVEUPGROUP" +#define HID_DLGREPORT_2_CMDMOVEDOWNGROUP "WIZARDS_HID_DLGREPORT_2_CMDMOVEDOWNGROUP" + + +#define HID_DLGREPORT_3_SORT1 "WIZARDS_HID_DLGREPORT_3_SORT1" +#define HID_DLGREPORT_3_OPTASCEND1 "WIZARDS_HID_DLGREPORT_3_OPTASCEND1" +#define HID_DLGREPORT_3_OPTDESCEND1 "WIZARDS_HID_DLGREPORT_3_OPTDESCEND1" +#define HID_DLGREPORT_3_SORT2 "WIZARDS_HID_DLGREPORT_3_SORT2" +#define HID_DLGREPORT_3_OPTASCEND2 "WIZARDS_HID_DLGREPORT_3_OPTASCEND2" +#define HID_DLGREPORT_3_OPTDESCEND2 "WIZARDS_HID_DLGREPORT_3_OPTDESCEND2" +#define HID_DLGREPORT_3_SORT3 "WIZARDS_HID_DLGREPORT_3_SORT3" +#define HID_DLGREPORT_3_OPTASCEND3 "WIZARDS_HID_DLGREPORT_3_OPTASCEND3" +#define HID_DLGREPORT_3_OPTDESCEND3 "WIZARDS_HID_DLGREPORT_3_OPTDESCEND3" +#define HID_DLGREPORT_3_SORT4 "WIZARDS_HID_DLGREPORT_3_SORT4" +#define HID_DLGREPORT_3_OPTASCEND4 "WIZARDS_HID_DLGREPORT_3_OPTASCEND4" +#define HID_DLGREPORT_3_OPTDESCEND4 "WIZARDS_HID_DLGREPORT_3_OPTDESCEND4" + +#define HID_DLGREPORT_4_TITLE "WIZARDS_HID_DLGREPORT_4_TITLE" +#define HID_DLGREPORT_4_DATALAYOUT "WIZARDS_HID_DLGREPORT_4_DATALAYOUT" +#define HID_DLGREPORT_4_PAGELAYOUT "WIZARDS_HID_DLGREPORT_4_PAGELAYOUT" +#define HID_DLGREPORT_4_LANDSCAPE "WIZARDS_HID_DLGREPORT_4_LANDSCAPE" +#define HID_DLGREPORT_4_PORTRAIT "WIZARDS_HID_DLGREPORT_4_PORTRAIT" + +#define HID_DLGREPORT_5_OPTDYNTEMPLATE "WIZARDS_HID_DLGREPORT_5_OPTDYNTEMPLATE" +#define HID_DLGREPORT_5_OPTSTATDOCUMENT "WIZARDS_HID_DLGREPORT_5_OPTSTATDOCUMENT" +#define HID_DLGREPORT_5_TXTTEMPLATEPATH "WIZARDS_HID_DLGREPORT_5_TXTTEMPLATEPATH" +#define HID_DLGREPORT_5_CMDTEMPLATEPATH "WIZARDS_HID_DLGREPORT_5_CMDTEMPLATEPATH" +#define HID_DLGREPORT_5_OPTEDITTEMPLATE "WIZARDS_HID_DLGREPORT_5_OPTEDITTEMPLATE" +#define HID_DLGREPORT_5_OPTUSETEMPLATE "WIZARDS_HID_DLGREPORT_5_OPTUSETEMPLATE" +#define HID_DLGREPORT_5_TXTDOCUMENTPATH "WIZARDS_HID_DLGREPORT_5_TXTDOCUMENTPATH" +#define HID_DLGREPORT_5_CMDDOCUMENTPATH "WIZARDS_HID_DLGREPORT_5_CMDDOCUMENTPATH" +#define HID_DLGREPORT_5_CHKLINKTODB "WIZARDS_HID_DLGREPORT_5_CHKLINKTODB" +#define HID_DLGREPORT_6_TXTTITLE_1 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_1" +#define HID_DLGREPORT_6_TXTTITLE_2 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_2" +#define HID_DLGREPORT_6_TXTTITLE_3 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_3" +#define HID_DLGREPORT_6_TXTTITLE_4 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_4" +#define HID_DLGREPORT_6_TXTTITLE_5 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_5" +#define HID_DLGREPORT_6_TXTTITLE_6 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_6" +#define HID_DLGREPORT_6_TXTTITLE_7 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_7" + + +/* ==================================== + * FormWizard + * ==================================== + */ + + +#define HID_DLGFORM_DIALOG "WIZARDS_HID_DLGFORM_DIALOG" +#define HID_DLGFORM_CMDPREV "WIZARDS_HID_DLGFORM_CMDPREV" +#define HID_DLGFORM_CMDNEXT "WIZARDS_HID_DLGFORM_CMDNEXT" +#define HID_DLGFORM_CMDFINISH "WIZARDS_HID_DLGFORM_CMDFINISH" +#define HID_DLGFORM_CMDCANCEL "WIZARDS_HID_DLGFORM_CMDCANCEL" + +#define HID_DLGFORM_MASTER_LBTABLES "WIZARDS_HID_DLGFORM_MASTER_LBTABLES" +#define HID_DLGFORM_MASTER_FIELDSAVAILABLE "WIZARDS_HID_DLGFORM_MASTER_FIELDSAVAILABLE" +#define HID_DLGFORM_MASTER_CMDMOVESELECTED "WIZARDS_HID_DLGFORM_MASTER_CMDMOVESELECTED" +#define HID_DLGFORM_MASTER_CMDMOVEALL "WIZARDS_HID_DLGFORM_MASTER_CMDMOVEALL" +#define HID_DLGFORM_MASTER_CMDREMOVESELECTED "WIZARDS_HID_DLGFORM_MASTER_CMDREMOVESELECTED" +#define HID_DLGFORM_MASTER_CMDREMOVEALL "WIZARDS_HID_DLGFORM_MASTER_CMDREMOVEALL" +#define HID_DLGFORM_MASTER_FIELDSSELECTED "WIZARDS_HID_DLGFORM_MASTER_FIELDSSELECTED" +#define HID_DLGFORM_MASTER_CMDMOVEUP "WIZARDS_HID_DLGFORM_MASTER_CMDMOVEUP" +#define HID_DLGFORM_MASTER_CMDMOVEDOWN "WIZARDS_HID_DLGFORM_MASTER_CMDMOVEDOWN" + + +#define HID_DLGFORM_CHKCREATESUBFORM "WIZARDS_HID_DLGFORM_CHKCREATESUBFORM" +#define HID_DLGFORM_OPTONEXISTINGRELATION "WIZARDS_HID_DLGFORM_OPTONEXISTINGRELATION" +#define HID_DLGFORM_OPTSELECTMANUALLY "WIZARDS_HID_DLGFORM_OPTSELECTMANUALLY" +#define HID_DLGFORM_lstRELATIONS "WIZARDS_HID_DLGFORM_lstRELATIONS" + + +#define HID_DLGFORM_SUB_LBTABLES "WIZARDS_HID_DLGFORM_SUB_LBTABLES" +#define HID_DLGFORM_SUB_FIELDSAVAILABLE "WIZARDS_HID_DLGFORM_SUB_FIELDSAVAILABLE" +#define HID_DLGFORM_SUB_CMDMOVESELECTED "WIZARDS_HID_DLGFORM_SUB_CMDMOVESELECTED" +#define HID_DLGFORM_SUB_CMDMOVEALL "WIZARDS_HID_DLGFORM_SUB_CMDMOVEALL" +#define HID_DLGFORM_SUB_CMDREMOVESELECTED "WIZARDS_HID_DLGFORM_SUB_CMDREMOVESELECTED" +#define HID_DLGFORM_SUB_CMDREMOVEALL "WIZARDS_HID_DLGFORM_SUB_CMDREMOVEALL" +#define HID_DLGFORM_SUB_FIELDSSELECTED "WIZARDS_HID_DLGFORM_SUB_FIELDSSELECTED" +#define HID_DLGFORM_SUB_CMDMOVEUP "WIZARDS_HID_DLGFORM_SUB_CMDMOVEUP" +#define HID_DLGFORM_SUB_CMDMOVEDOWN "WIZARDS_HID_DLGFORM_SUB_CMDMOVEDOWN" + + +#define HID_DLGFORM_LINKER_LSTSLAVELINK1 "WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK1" +#define HID_DLGFORM_LINKER_LSTMASTERLINK1 "WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK1" +#define HID_DLGFORM_LINKER_LSTSLAVELINK2 "WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK2" +#define HID_DLGFORM_LINKER_LSTMASTERLINK2 "WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK2" +#define HID_DLGFORM_LINKER_LSTSLAVELINK3 "WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK3" +#define HID_DLGFORM_LINKER_LSTMASTERLINK3 "WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK3" +#define HID_DLGFORM_LINKER_LSTSLAVELINK4 "WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK4" +#define HID_DLGFORM_LINKER_LSTMASTERLINK4 "WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK4" + +#define HID_DLGFORM_CMDALIGNLEFT "WIZARDS_HID_DLGFORM_CMDALIGNLEFT" +#define HID_DLGFORM_CMDALIGNRIGHT "WIZARDS_HID_DLGFORM_CMDALIGNRIGHT" + + +#define HID_DLGFORM_CMDLEFTLABELED "WIZARDS_HID_DLGFORM_CMDLEFTLABELED" +#define HID_DLGFORM_CMDTOPLABELED "WIZARDS_HID_DLGFORM_CMDTOPLABELED" +#define HID_DLGFORM_CMDTABLESTYLE "WIZARDS_HID_DLGFORM_CMDTABLESTYLE" +#define HID_DLGFORM_CMDTOPJUSTIFIED "WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED" + +#define HID_DLGFORM_CMDLEFTLABELED2 "WIZARDS_HID_DLGFORM_CMDLEFTLABELED2" +#define HID_DLGFORM_CMDTOPLABELED2 "WIZARDS_HID_DLGFORM_CMDTOPLABELED2" +#define HID_DLGFORM_CMDTABLESTYLE2 "WIZARDS_HID_DLGFORM_CMDTABLESTYLE2" +#define HID_DLGFORM_CMDTOPJUSTIFIED2 "WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED2" + +#define HID_DLGFORM_OPTNEWDATAONLY "WIZARDS_HID_DLGFORM_OPTNEWDATAONLY" +#define HID_DLGFORM_OPTDISPLAYALLDATA "WIZARDS_HID_DLGFORM_OPTDISPLAYALLDATA" +#define HID_DLGFORM_CHKNOMODIFICATION "WIZARDS_HID_DLGFORM_CHKNOMODIFICATION" +#define HID_DLGFORM_CHKNODELETION "WIZARDS_HID_DLGFORM_CHKNODELETION" +#define HID_DLGFORM_CHKNOADDITION "WIZARDS_HID_DLGFORM_CHKNOADDITION" + + +#define HID_DLGFORM_LSTSTYLES "WIZARDS_HID_DLGFORM_LSTSTYLES" +#define HID_DLGFORM_CMDNOBORDER "WIZARDS_HID_DLGFORM_CMDNOBORDER" +#define HID_DLGFORM_CMD3DBORDER "WIZARDS_HID_DLGFORM_CMD3DBORDER" +#define HID_DLGFORM_CMDSIMPLEBORDER "WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER" + +#define HID_DLGFORM_TXTPATH "WIZARDS_HID_DLGFORM_TXTPATH" +#define HID_DLGFORM_OPTWORKWITHFORM "WIZARDS_HID_DLGFORM_OPTWORKWITHFORM" +#define HID_DLGFORM_OPTMODIFYFORM "WIZARDS_HID_DLGFORM_OPTMODIFYFORM" + + +#define HID_DLGNEWSLTR_DIALOG "WIZARDS_HID_DLGNEWSLTR_DIALOG" +#define HID_DLGNEWSLTR_OPTSTANDARDLAYOUT "WIZARDS_HID_DLGNEWSLTR_OPTSTANDARDLAYOUT" +#define HID_DLGNEWSLTR_OPTPARTYLAYOUT "WIZARDS_HID_DLGNEWSLTR_OPTPARTYLAYOUT" +#define HID_DLGNEWSLTR_OPTBROCHURELAYOUT "WIZARDS_HID_DLGNEWSLTR_OPTBROCHURELAYOUT" +#define HID_DLGNEWSLTR_OPTSINGLESIDED "WIZARDS_HID_DLGNEWSLTR_OPTSINGLESIDED" +#define HID_DLGNEWSLTR_OPTDOUBLESIDED "WIZARDS_HID_DLGNEWSLTR_OPTDOUBLESIDED" +#define HID_DLGNEWSLTR_CMDGOON "WIZARDS_HID_DLGNEWSLTR_CMDGOON" + + +#define HID_DLGDEPOT_DIALOG_SELLBUY "WIZARDS_HID_DLGDEPOT_DIALOG_SELLBUY" +#define HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY "WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY" +#define HID_DLGDEPOT_0_TXTQUANTITY "WIZARDS_HID_DLGDEPOT_0_TXTQUANTITY" +#define HID_DLGDEPOT_0_TXTRATE "WIZARDS_HID_DLGDEPOT_0_TXTRATE" +#define HID_DLGDEPOT_0_TXTDATE "WIZARDS_HID_DLGDEPOT_0_TXTDATE" +#define HID_DLGDEPOT_0_TXTCOMMISSION "WIZARDS_HID_DLGDEPOT_0_TXTCOMMISSION" +#define HID_DLGDEPOT_0_TXTFIX "WIZARDS_HID_DLGDEPOT_0_TXTFIX" +#define HID_DLGDEPOT_0_TXTMINIMUM "WIZARDS_HID_DLGDEPOT_0_TXTMINIMUM" +#define HID_DLGDEPOT_0_CMDCANCEL_SELLBUY "WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SELLBUY" +#define HID_DLGDEPOT_0_CMDGOON_SELLBUY "WIZARDS_HID_DLGDEPOT_0_CMDGOON_SELLBUY" +#define HID_DLGDEPOT_1_LSTSELLSTOCKS "WIZARDS_HID_DLGDEPOT_1_LSTSELLSTOCKS" +#define HID_DLGDEPOT_2_LSTBUYSTOCKS "WIZARDS_HID_DLGDEPOT_2_LSTBUYSTOCKS" +#define HID_DLGDEPOT_DIALOG_SPLIT "WIZARDS_HID_DLGDEPOT_DIALOG_SPLIT" +#define HID_DLGDEPOT_0_LSTSTOCKNAMES "WIZARDS_HID_DLGDEPOT_0_LSTSTOCKNAMES" +#define HID_DLGDEPOT_0_TXTSTOCKID_SPLIT "WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SPLIT" +#define HID_DLGDEPOT_0_CMDCANCEL_SPLIT "WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SPLIT" +#define HID_DLGDEPOT_0_CMDGOON_SPLIT "WIZARDS_HID_DLGDEPOT_0_CMDGOON_SPLIT" +#define HID_DLGDEPOT_1_OPTPERSHARE "WIZARDS_HID_DLGDEPOT_1_OPTPERSHARE" +#define HID_DLGDEPOT_1_OPTTOTAL "WIZARDS_HID_DLGDEPOT_1_OPTTOTAL" +#define HID_DLGDEPOT_1_TXTDIVIDEND "WIZARDS_HID_DLGDEPOT_1_TXTDIVIDEND" +#define HID_DLGDEPOT_2_TXTOLDRATE "WIZARDS_HID_DLGDEPOT_2_TXTOLDRATE" +#define HID_DLGDEPOT_2_TXTNEWRATE "WIZARDS_HID_DLGDEPOT_2_TXTNEWRATE" +#define HID_DLGDEPOT_2_TXTDATE "WIZARDS_HID_DLGDEPOT_2_TXTDATE" +#define HID_DLGDEPOT_3_TXTSTARTDATE "WIZARDS_HID_DLGDEPOT_3_TXTSTARTDATE" +#define HID_DLGDEPOT_3_TXTENDDATE "WIZARDS_HID_DLGDEPOT_3_TXTENDDATE" +#define HID_DLGDEPOT_3_OPTDAILY "WIZARDS_HID_DLGDEPOT_3_OPTDAILY" +#define HID_DLGDEPOT_3_OPTWEEKLY "WIZARDS_HID_DLGDEPOT_3_OPTWEEKLY" +#define HID_DLGDEPOT_DIALOG_HISTORY "WIZARDS_HID_DLGDEPOT_DIALOG_HISTORY" +#define HID_DLGDEPOT_LSTMARKETS "WIZARDS_HID_DLGDEPOT_LSTMARKETS" +#define HID_DLGDEPOT_0_CMDCANCEL_HISTORY "WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_HISTORY" +#define HID_DLGDEPOT_0_CMDGOON_HISTORY "WIZARDS_HID_DLGDEPOT_0_CMDGOON_HISTORY" + +#define HID_DLGIMPORT_DIALOG "WIZARDS_HID_DLGIMPORT_DIALOG" +#define HID_DLGIMPORT_0_CMDHELP "WIZARDS_HID_DLGIMPORT_0_CMDHELP" +#define HID_DLGIMPORT_0_CMDCANCEL "WIZARDS_HID_DLGIMPORT_0_CMDCANCEL" +#define HID_DLGIMPORT_0_CMDPREV "WIZARDS_HID_DLGIMPORT_0_CMDPREV" +#define HID_DLGIMPORT_0_CMDNEXT "WIZARDS_HID_DLGIMPORT_0_CMDNEXT" +#define HID_DLGIMPORT_0_OPTSODOCUMENTS "WIZARDS_HID_DLGIMPORT_0_OPTSODOCUMENTS" +#define HID_DLGIMPORT_0_OPTMSDOCUMENTS "WIZARDS_HID_DLGIMPORT_0_OPTMSDOCUMENTS" +#define HID_DLGIMPORT_0_CHKLOGFILE "WIZARDS_HID_DLGIMPORT_0_CHKLOGFILE" +#define HID_DLGIMPORT_2_CHKWORD "WIZARDS_HID_DLGIMPORT_2_CHKWORD" +#define HID_DLGIMPORT_2_CHKEXCEL "WIZARDS_HID_DLGIMPORT_2_CHKEXCEL" +#define HID_DLGIMPORT_2_CHKPOWERPOINT "WIZARDS_HID_DLGIMPORT_2_CHKPOWERPOINT" +#define HID_DLGIMPORT_2_CBTEMPLATE "WIZARDS_HID_DLGIMPORT_2_CBTEMPLATE" +#define HID_DLGIMPORT_2_CBTEMPLATERECURSE "WIZARDS_HID_DLGIMPORT_2_CBTEMPLATERECURSE" +#define HID_DLGIMPORT_2_LBTEMPLATEPATH "WIZARDS_HID_DLGIMPORT_2_LBTEMPLATEPATH" +#define HID_DLGIMPORT_2_EDTEMPLATEPATH "WIZARDS_HID_DLGIMPORT_2_EDTEMPLATEPATH" +#define HID_DLGIMPORT_2_CBDOCUMENT "WIZARDS_HID_DLGIMPORT_2_CBDOCUMENT" +#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT "WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT" +#define HID_DLGIMPORT_2_CBDOCUMENT "WIZARDS_HID_DLGIMPORT_2_CBDOCUMENT" +#define HID_DLGIMPORT_2_CBDOCUMENTRECURSE "WIZARDS_HID_DLGIMPORT_2_CBDOCUMENTRECURSE" +#define HID_DLGIMPORT_2_LBDOCUMENTPATH "WIZARDS_HID_DLGIMPORT_2_LBDOCUMENTPATH" +#define HID_DLGIMPORT_2_EDDOCUMENTPATH "WIZARDS_HID_DLGIMPORT_2_EDDOCUMENTPATH" +#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT "WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT" +#define HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH "WIZARDS_HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH" +#define HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH "WIZARDS_HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH" +#define HID_DLGIMPORT_2_CMDEXPORTPATHSELECT "WIZARDS_HID_DLGIMPORT_2_CMDEXPORTPATHSELECT" +#define HID_DLGIMPORT_3_TBSUMMARY "WIZARDS_HID_DLGIMPORT_3_TBSUMMARY" + +#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2 "WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2" +#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2 "WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2" + + +#define HID_DLGIMPORT_0_CHKWRITER "WIZARDS_HID_DLGIMPORT_0_CHKWRITER" +#define HID_DLGIMPORT_0_CHKCALC "WIZARDS_HID_DLGIMPORT_0_CHKCALC" +#define HID_DLGIMPORT_0_CHKIMPRESS "WIZARDS_HID_DLGIMPORT_0_CHKIMPRESS" +#define HID_DLGIMPORT_0_CHKMATHGLOBAL "WIZARDS_HID_DLGIMPORT_0_CHKMATHGLOBAL" + + +#define HID_DLGCORRESPONDENCE_DIALOG "WIZARDS_HID_DLGCORRESPONDENCE_DIALOG" +#define HID_DLGCORRESPONDENCE_CANCEL "WIZARDS_HID_DLGCORRESPONDENCE_CANCEL" +#define HID_DLGCORRESPONDENCE_OPTIONAGENDA1 "WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA1" +#define HID_DLGCORRESPONDENCE_OPTIONAGENDA2 "WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA2" +#define HID_DLGCORRESPONDENCE_AGENDAOKAY "WIZARDS_HID_DLGCORRESPONDENCE_AGENDAOKAY" +#define HID_DLGCORRESPONDENCE_OPTIONLETTER1 "WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER1" +#define HID_DLGCORRESPONDENCE_OPTIONLETTER2 "WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER2" +#define HID_DLGCORRESPONDENCE_LETTEROKAY "WIZARDS_HID_DLGCORRESPONDENCE_LETTEROKAY" + +#define HID_DLGSTYLES_DIALOG "WIZARDS_HID_DLGSTYLES_DIALOG" +#define HID_DLGSTYLES_LISTBOX "WIZARDS_HID_DLGSTYLES_LISTBOX" +#define HID_DLGSTYLES_CANCEL "WIZARDS_HID_DLGSTYLES_CANCEL" +#define HID_DLGSTYLES_OKAY "WIZARDS_HID_DLGSTYLES_OKAY" + +#define HID_DLGCONVERT_DIALOG "WIZARDS_HID_DLGCONVERT_DIALOG" +#define HID_DLGCONVERT_CHECKBOX1 "WIZARDS_HID_DLGCONVERT_CHECKBOX1" +#define HID_DLGCONVERT_OPTIONBUTTON1 "WIZARDS_HID_DLGCONVERT_OPTIONBUTTON1" +#define HID_DLGCONVERT_OPTIONBUTTON2 "WIZARDS_HID_DLGCONVERT_OPTIONBUTTON2" +#define HID_DLGCONVERT_OPTIONBUTTON3 "WIZARDS_HID_DLGCONVERT_OPTIONBUTTON3" +#define HID_DLGCONVERT_OPTIONBUTTON4 "WIZARDS_HID_DLGCONVERT_OPTIONBUTTON4" +#define HID_DLGCONVERT_LISTBOX1 "WIZARDS_HID_DLGCONVERT_LISTBOX1" +#define HID_DLGCONVERT_OBFILE "WIZARDS_HID_DLGCONVERT_OBFILE" +#define HID_DLGCONVERT_OBDIR "WIZARDS_HID_DLGCONVERT_OBDIR" +#define HID_DLGCONVERT_COMBOBOX1 "WIZARDS_HID_DLGCONVERT_COMBOBOX1" +#define HID_DLGCONVERT_TBSOURCE "WIZARDS_HID_DLGCONVERT_TBSOURCE" +#define HID_DLGCONVERT_CHECKRECURSIVE "WIZARDS_HID_DLGCONVERT_CHECKRECURSIVE" +#define HID_DLGCONVERT_TBTARGET "WIZARDS_HID_DLGCONVERT_TBTARGET" +#define HID_DLGCONVERT_CBCANCEL "WIZARDS_HID_DLGCONVERT_CBCANCEL" +#define HID_DLGCONVERT_CBHELP "WIZARDS_HID_DLGCONVERT_CBHELP" +#define HID_DLGCONVERT_CBBACK "WIZARDS_HID_DLGCONVERT_CBBACK" +#define HID_DLGCONVERT_CBGOON "WIZARDS_HID_DLGCONVERT_CBGOON" +#define HID_DLGCONVERT_CBSOURCEOPEN "WIZARDS_HID_DLGCONVERT_CBSOURCEOPEN" +#define HID_DLGCONVERT_CBTARGETOPEN "WIZARDS_HID_DLGCONVERT_CBTARGETOPEN" +#define HID_DLGCONVERT_CHKPROTECT "WIZARDS_HID_DLGCONVERT_CHKPROTECT" +#define HID_DLGCONVERT_CHKTEXTDOCUMENTS "WIZARDS_HID_DLGCONVERT_CHKTEXTDOCUMENTS" + +#define HID_DLGPASSWORD_CMDGOON "WIZARDS_HID_DLGPASSWORD_CMDGOON" +#define HID_DLGPASSWORD_CMDCANCEL "WIZARDS_HID_DLGPASSWORD_CMDCANCEL" +#define HID_DLGPASSWORD_CMDHELP "WIZARDS_HID_DLGPASSWORD_CMDHELP" +#define HID_DLGPASSWORD_TXTPASSWORD "WIZARDS_HID_DLGPASSWORD_TXTPASSWORD" + +#define HID_DLGHOLIDAYCAL_DIALOG "WIZARDS_HID_DLGHOLIDAYCAL_DIALOG" +#define HID_DLGHOLIDAYCAL_1_PREVIEW "WIZARDS_HID_DLGHOLIDAYCAL_1_PREVIEW" +#define HID_DLGHOLIDAYCAL_1_OPYEAR "WIZARDS_HID_DLGHOLIDAYCAL_1_OPYEAR" +#define HID_DLGHOLIDAYCAL_1_OPMONTH "WIZARDS_HID_DLGHOLIDAYCAL_1_OPMONTH" +#define HID_DLGHOLIDAYCAL_1_EDYEAR "WIZARDS_HID_DLGHOLIDAYCAL_1_EDYEAR" +#define HID_DLGHOLIDAYCAL_1_EDMONTH "WIZARDS_HID_DLGHOLIDAYCAL_1_EDMONTH" +#define HID_DLGHOLIDAYCAL_1_SPINYEAR "WIZARDS_HID_DLGHOLIDAYCAL_1_SPINYEAR" +#define HID_DLGHOLIDAYCAL_1_SPINMONTH "WIZARDS_HID_DLGHOLIDAYCAL_1_SPINMONTH" +#define HID_DLGHOLIDAYCAL_1_CMBSTATE "WIZARDS_HID_DLGHOLIDAYCAL_1_CMBSTATE" +#define HID_DLGHOLIDAYCAL_2_LBOWNDATA "WIZARDS_HID_DLGHOLIDAYCAL_2_LBOWNDATA" +#define HID_DLGHOLIDAYCAL_2_CMDINSERT "WIZARDS_HID_DLGHOLIDAYCAL_2_CMDINSERT" +#define HID_DLGHOLIDAYCAL_2_CMDDELETE "WIZARDS_HID_DLGHOLIDAYCAL_2_CMDDELETE" +#define HID_DLGHOLIDAYCAL_2_EDEVENT "WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENT" +#define HID_DLGHOLIDAYCAL_2_CHKEVENT "WIZARDS_HID_DLGHOLIDAYCAL_2_CHKEVENT" +#define HID_DLGHOLIDAYCAL_2_EDEVENTDAY "WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTDAY" +#define HID_DLGHOLIDAYCAL_2_SPINEVENTDAY "WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTDAY" +#define HID_DLGHOLIDAYCAL_2_EDEVENTMONTH "WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTMONTH" +#define HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH "WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH" +#define HID_DLGHOLIDAYCAL_2_EDEVENTYEAR "WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTYEAR" +#define HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR "WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR" +#define HID_DLGHOLIDAYCAL_0_CMDOWNDATA "WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOWNDATA" +#define HID_DLGHOLIDAYCAL_0_CMDCANCEL "WIZARDS_HID_DLGHOLIDAYCAL_0_CMDCANCEL" +#define HID_DLGHOLIDAYCAL_0_CMDOK "WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOK" +//End at 34767 + +//Start at 40768 + +//LetterWizard--------------------------- + +#define HID_LTRWIZ_OPTBUSINESSLETTER "WIZARDS_HID_LTRWIZ_OPTBUSINESSLETTER" +#define HID_LTRWIZ_OPTPRIVOFFICIALLETTER "WIZARDS_HID_LTRWIZ_OPTPRIVOFFICIALLETTER" +#define HID_LTRWIZ_OPTPRIVATELETTER "WIZARDS_HID_LTRWIZ_OPTPRIVATELETTER" +#define HID_LTRWIZ_LSTBUSINESSSTYLE "WIZARDS_HID_LTRWIZ_LSTBUSINESSSTYLE" +#define HID_LTRWIZ_CHKBUSINESSPAPER "WIZARDS_HID_LTRWIZ_CHKBUSINESSPAPER" +#define HID_LTRWIZ_LSTPRIVOFFICIALSTYLE "WIZARDS_HID_LTRWIZ_LSTPRIVOFFICIALSTYLE" +#define HID_LTRWIZ_LSTPRIVATESTYLE "WIZARDS_HID_LTRWIZ_LSTPRIVATESTYLE" +#define HID_LTRWIZ_CHKPAPERCOMPANYLOGO "WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYLOGO" +#define HID_LTRWIZ_NUMLOGOHEIGHT "WIZARDS_HID_LTRWIZ_NUMLOGOHEIGHT" +#define HID_LTRWIZ_NUMLOGOX "WIZARDS_HID_LTRWIZ_NUMLOGOX" +#define HID_LTRWIZ_NUMLOGOWIDTH "WIZARDS_HID_LTRWIZ_NUMLOGOWIDTH" +#define HID_LTRWIZ_NUMLOGOY "WIZARDS_HID_LTRWIZ_NUMLOGOY" +#define HID_LTRWIZ_CHKPAPERCOMPANYADDRESS "WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYADDRESS" +#define HID_LTRWIZ_NUMADDRESSHEIGHT "WIZARDS_HID_LTRWIZ_NUMADDRESSHEIGHT" +#define HID_LTRWIZ_NUMADDRESSX "WIZARDS_HID_LTRWIZ_NUMADDRESSX" +#define HID_LTRWIZ_NUMADDRESSWIDTH "WIZARDS_HID_LTRWIZ_NUMADDRESSWIDTH" +#define HID_LTRWIZ_NUMADDRESSY "WIZARDS_HID_LTRWIZ_NUMADDRESSY" +#define HID_LTRWIZ_CHKCOMPANYRECEIVER "WIZARDS_HID_LTRWIZ_CHKCOMPANYRECEIVER" +#define HID_LTRWIZ_CHKPAPERFOOTER "WIZARDS_HID_LTRWIZ_CHKPAPERFOOTER" +#define HID_LTRWIZ_NUMFOOTERHEIGHT "WIZARDS_HID_LTRWIZ_NUMFOOTERHEIGHT" +#define HID_LTRWIZ_LSTLETTERNORM "WIZARDS_HID_LTRWIZ_LSTLETTERNORM" +#define HID_LTRWIZ_CHKUSELOGO "WIZARDS_HID_LTRWIZ_CHKUSELOGO" +#define HID_LTRWIZ_CHKUSEADDRESSRECEIVER "WIZARDS_HID_LTRWIZ_CHKUSEADDRESSRECEIVER" +#define HID_LTRWIZ_CHKUSESIGNS "WIZARDS_HID_LTRWIZ_CHKUSESIGNS" +#define HID_LTRWIZ_CHKUSESUBJECT "WIZARDS_HID_LTRWIZ_CHKUSESUBJECT" +#define HID_LTRWIZ_CHKUSESALUTATION "WIZARDS_HID_LTRWIZ_CHKUSESALUTATION" +#define HID_LTRWIZ_LSTSALUTATION "WIZARDS_HID_LTRWIZ_LSTSALUTATION" +#define HID_LTRWIZ_CHKUSEBENDMARKS "WIZARDS_HID_LTRWIZ_CHKUSEBENDMARKS" +#define HID_LTRWIZ_CHKUSEGREETING "WIZARDS_HID_LTRWIZ_CHKUSEGREETING" +#define HID_LTRWIZ_LSTGREETING "WIZARDS_HID_LTRWIZ_LSTGREETING" +#define HID_LTRWIZ_CHKUSEFOOTER "WIZARDS_HID_LTRWIZ_CHKUSEFOOTER" +#define HID_LTRWIZ_OPTSENDERPLACEHOLDER "WIZARDS_HID_LTRWIZ_OPTSENDERPLACEHOLDER" +#define HID_LTRWIZ_OPTSENDERDEFINE "WIZARDS_HID_LTRWIZ_OPTSENDERDEFINE" +#define HID_LTRWIZ_TXTSENDERNAME "WIZARDS_HID_LTRWIZ_TXTSENDERNAME" +#define HID_LTRWIZ_TXTSENDERSTREET "WIZARDS_HID_LTRWIZ_TXTSENDERSTREET" +#define HID_LTRWIZ_TXTSENDERPOSTCODE "WIZARDS_HID_LTRWIZ_TXTSENDERPOSTCODE" +#define HID_LTRWIZ_TXTSENDERSTATE_TEXT "WIZARDS_HID_LTRWIZ_TXTSENDERSTATE_TEXT" +#define HID_LTRWIZ_TXTSENDERCITY "WIZARDS_HID_LTRWIZ_TXTSENDERCITY" +#define HID_LTRWIZ_OPTRECEIVERPLACEHOLDER "WIZARDS_HID_LTRWIZ_OPTRECEIVERPLACEHOLDER" +#define HID_LTRWIZ_OPTRECEIVERDATABASE "WIZARDS_HID_LTRWIZ_OPTRECEIVERDATABASE" +#define HID_LTRWIZ_TXTFOOTER "WIZARDS_HID_LTRWIZ_TXTFOOTER" +#define HID_LTRWIZ_CHKFOOTERNEXTPAGES "WIZARDS_HID_LTRWIZ_CHKFOOTERNEXTPAGES" +#define HID_LTRWIZ_CHKFOOTERPAGENUMBERS "WIZARDS_HID_LTRWIZ_CHKFOOTERPAGENUMBERS" +#define HID_LTRWIZ_TXTTEMPLATENAME "WIZARDS_HID_LTRWIZ_TXTTEMPLATENAME" +#define HID_LTRWIZ_OPTCREATELETTER "WIZARDS_HID_LTRWIZ_OPTCREATELETTER" +#define HID_LTRWIZ_OPTMAKECHANGES "WIZARDS_HID_LTRWIZ_OPTMAKECHANGES" +#define HID_LTRWIZ_TXTPATH "WIZARDS_HID_LTRWIZ_TXTPATH" +#define HID_LTRWIZ_CMDPATH "WIZARDS_HID_LTRWIZ_CMDPATH" + +#define HID_LTRWIZARD "WIZARDS_HID_LTRWIZARD" +#define HID_LTRWIZARD_HELP "WIZARDS_HID_LTRWIZARD_HELP" +#define HID_LTRWIZARD_BACK "WIZARDS_HID_LTRWIZARD_BACK" +#define HID_LTRWIZARD_NEXT "WIZARDS_HID_LTRWIZARD_NEXT" +#define HID_LTRWIZARD_CREATE "WIZARDS_HID_LTRWIZARD_CREATE" +#define HID_LTRWIZARD_CANCEL "WIZARDS_HID_LTRWIZARD_CANCEL" + +#define HID_QUERYWIZARD_LSTTABLES "WIZARDS_HID_QUERYWIZARD_LSTTABLES" +#define HID_QUERYWIZARD_LSTFIELDS "WIZARDS_HID_QUERYWIZARD_LSTFIELDS" +#define HID_QUERYWIZARD_CMDMOVESELECTED "WIZARDS_HID_QUERYWIZARD_CMDMOVESELECTED" +#define HID_QUERYWIZARD_CMDMOVEALL "WIZARDS_HID_QUERYWIZARD_CMDMOVEALL" +#define HID_QUERYWIZARD_CMDREMOVESELECTED "WIZARDS_HID_QUERYWIZARD_CMDREMOVESELECTED" +#define HID_QUERYWIZARD_CMDREMOVEALL "WIZARDS_HID_QUERYWIZARD_CMDREMOVEALL" +#define HID_QUERYWIZARD_LSTSELFIELDS "WIZARDS_HID_QUERYWIZARD_LSTSELFIELDS" +#define HID_QUERYWIZARD_CMDMOVEUP "WIZARDS_HID_QUERYWIZARD_CMDMOVEUP" +#define HID_QUERYWIZARD_CMDMOVEDOWN "WIZARDS_HID_QUERYWIZARD_CMDMOVEDOWN" + +#define HID_QUERYWIZARD_SORT1 "WIZARDS_HID_QUERYWIZARD_SORT1" +#define HID_QUERYWIZARD_OPTASCEND1 "WIZARDS_HID_QUERYWIZARD_OPTASCEND1" +#define HID_QUERYWIZARD_OPTDESCEND1 "WIZARDS_HID_QUERYWIZARD_OPTDESCEND1" +#define HID_QUERYWIZARD_SORT2 "WIZARDS_HID_QUERYWIZARD_SORT2" +#define HID_QUERYWIZARD_OPTASCEND2 "WIZARDS_HID_QUERYWIZARD_OPTASCEND2" +#define HID_QUERYWIZARD_OPTDESCEND2 "WIZARDS_HID_QUERYWIZARD_OPTDESCEND2" +#define HID_QUERYWIZARD_SORT3 "WIZARDS_HID_QUERYWIZARD_SORT3" +#define HID_QUERYWIZARD_OPTASCEND3 "WIZARDS_HID_QUERYWIZARD_OPTASCEND3" +#define HID_QUERYWIZARD_OPTDESCEND3 "WIZARDS_HID_QUERYWIZARD_OPTDESCEND3" +#define HID_QUERYWIZARD_SORT4 "WIZARDS_HID_QUERYWIZARD_SORT4" +#define HID_QUERYWIZARD_OPTASCEND4 "WIZARDS_HID_QUERYWIZARD_OPTASCEND4" +#define HID_QUERYWIZARD_OPTDESCEND4 "WIZARDS_HID_QUERYWIZARD_OPTDESCEND4" + +#define HID_QUERYWIZARD_OPTMATCHALL "WIZARDS_HID_QUERYWIZARD_OPTMATCHALL" +#define HID_QUERYWIZARD_OPTMATCHANY "WIZARDS_HID_QUERYWIZARD_OPTMATCHANY" + +#define HID_QUERYWIZARD_LSTFIELDNAME_1 "WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_1" +#define HID_QUERYWIZARD_LSTOPERATOR_1 "WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_1" +#define HID_QUERYWIZARD_TXTVALUE_1 "WIZARDS_HID_QUERYWIZARD_TXTVALUE_1" +#define HID_QUERYWIZARD_LSTFIELDNAME_2 "WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_2" +#define HID_QUERYWIZARD_LSTOPERATOR_2 "WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_2" +#define HID_QUERYWIZARD_TXTVALUE_2 "WIZARDS_HID_QUERYWIZARD_TXTVALUE_2" +#define HID_QUERYWIZARD_LSTFIELDNAME_3 "WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_3" +#define HID_QUERYWIZARD_LSTOPERATOR_3 "WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_3" +#define HID_QUERYWIZARD_TXTVALUE_3 "WIZARDS_HID_QUERYWIZARD_TXTVALUE_3" + +#define HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY "WIZARDS_HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY" +#define HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY "WIZARDS_HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5" +#define HID_QUERYWIZARD_BTNAGGREGATEPLUS "WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEPLUS" +#define HID_QUERYWIZARD_BTNAGGREGATEMINUS "WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEMINUS" + +#define HID_QUERYWIZARD_LSTFILTERFIELDS "WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDS" +#define HID_QUERYWIZARD_CMDFILTERMOVESELECTED "WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVESELECTED" +#define HID_QUERYWIZARD_CMDFILTERREMOVESELECTED "WIZARDS_HID_QUERYWIZARD_CMDFILTERREMOVESELECTED" +#define HID_QUERYWIZARD_LSTFILTERSELFIELDS "WIZARDS_HID_QUERYWIZARD_LSTFILTERSELFIELDS" +#define HID_QUERYWIZARD_CMDFILTERMOVEUP "WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEUP" +#define HID_QUERYWIZARD_CMDFILTERMOVEDOWN "WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEDOWN" + +#define HID_QUERYWIZARD_OPTGROUPMATCHALL "WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHALL" +#define HID_QUERYWIZARD_OPTGROUPMATCHANY "WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHANY" + +#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_1 "WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_1" +#define HID_QUERYWIZARD_LSTFILTEROPERATOR_1 "WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_1" +#define HID_QUERYWIZARD_TXTFILTERVALUE_1 "WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_1" +#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_2 "WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_2" +#define HID_QUERYWIZARD_LSTFILTEROPERATOR_2 "WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_2" +#define HID_QUERYWIZARD_TXTFILTERVALUE_2 "WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_2" +#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_3 "WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_3" +#define HID_QUERYWIZARD_LSTFILTEROPERATOR_3 "WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_3" +#define HID_QUERYWIZARD_TXTFILTERVALUE_3 "WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_3" + +#define HID_QUERYWIZARD_TXTTITLE_1 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_1" +#define HID_QUERYWIZARD_TXTTITLE_2 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_2" +#define HID_QUERYWIZARD_TXTTITLE_3 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_3" +#define HID_QUERYWIZARD_TXTTITLE_4 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_4" +#define HID_QUERYWIZARD_TXTTITLE_5 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_5" +#define HID_QUERYWIZARD_TXTTITLE_6 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_6" +#define HID_QUERYWIZARD_TXTTITLE_7 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_7" + +#define HID_QUERYWIZARD_TXTQUERYTITLE "WIZARDS_HID_QUERYWIZARD_TXTQUERYTITLE" +#define HID_QUERYWIZARD_OPTDISPLAYQUERY "WIZARDS_HID_QUERYWIZARD_OPTDISPLAYQUERY" +#define HID_QUERYWIZARD_OPTMODIFYQUERY "WIZARDS_HID_QUERYWIZARD_OPTMODIFYQUERY" +#define HID_QUERYWIZARD_TXTSUMMARY "WIZARDS_HID_QUERYWIZARD_TXTSUMMARY" + +#define HID_QUERYWIZARD "WIZARDS_HID_QUERYWIZARD" +#define HID_QUERYWIZARD_BACK "WIZARDS_HID_QUERYWIZARD_BACK" +#define HID_QUERYWIZARD_NEXT "WIZARDS_HID_QUERYWIZARD_NEXT" +#define HID_QUERYWIZARD_CREATE "WIZARDS_HID_QUERYWIZARD_CREATE" +#define HID_QUERYWIZARD_CANCEL "WIZARDS_HID_QUERYWIZARD_CANCEL" + +// ++++++++++++++++++++++++++++++++++++++ +// +++ Web Wizard : Continued from 34312 +// ++++++++++++++++++++++++++++++++++++++ +// web wizard iconssets dialog +#define HID_IS "WIZARDS_HID_IS" +#define HID_IS_BTN_NONE "WIZARDS_HID_IS_BTN_NONE" +#define HID_IS_BTN_OK "WIZARDS_HID_IS_BTN_OK" +#define HID_IS_BTN_CANCEL "WIZARDS_HID_IS_BTN_CANCEL" + +#define HID_IS_BTN_IMG1 "WIZARDS_HID_IS_BTN_IMG1" +#define HID_IS_BTN_IMG2 "WIZARDS_HID_IS_BTN_IMG2" +#define HID_IS_BTN_IMG3 "WIZARDS_HID_IS_BTN_IMG3" +#define HID_IS_BTN_IMG4 "WIZARDS_HID_IS_BTN_IMG4" +#define HID_IS_BTN_IMG5 "WIZARDS_HID_IS_BTN_IMG5" +#define HID_IS_BTN_IMG6 "WIZARDS_HID_IS_BTN_IMG6" +#define HID_IS_BTN_IMG7 "WIZARDS_HID_IS_BTN_IMG7" +#define HID_IS_BTN_IMG8 "WIZARDS_HID_IS_BTN_IMG8" +#define HID_IS_BTN_IMG9 "WIZARDS_HID_IS_BTN_IMG9" +#define HID_IS_BTN_IMG10 "WIZARDS_HID_IS_BTN_IMG10" +#define HID_IS_BTN_IMG11 "WIZARDS_HID_IS_BTN_IMG11" +#define HID_IS_BTN_IMG12 "WIZARDS_HID_IS_BTN_IMG12" +#define HID_IS_BTN_IMG13 "WIZARDS_HID_IS_BTN_IMG13" +#define HID_IS_BTN_IMG14 "WIZARDS_HID_IS_BTN_IMG14" +#define HID_IS_BTN_IMG15 "WIZARDS_HID_IS_BTN_IMG15" +#define HID_IS_BTN_IMG16 "WIZARDS_HID_IS_BTN_IMG16" +#define HID_IS_BTN_IMG17 "WIZARDS_HID_IS_BTN_IMG17" +#define HID_IS_BTN_IMG18 "WIZARDS_HID_IS_BTN_IMG18" +#define HID_IS_BTN_IMG19 "WIZARDS_HID_IS_BTN_IMG19" +#define HID_IS_BTN_IMG20 "WIZARDS_HID_IS_BTN_IMG20" +#define HID_IS_BTN_IMG21 "WIZARDS_HID_IS_BTN_IMG21" +#define HID_IS_BTN_IMG22 "WIZARDS_HID_IS_BTN_IMG22" +#define HID_IS_BTN_IMG23 "WIZARDS_HID_IS_BTN_IMG23" +#define HID_IS_BTN_IMG24 "WIZARDS_HID_IS_BTN_IMG24" +#define HID_IS_BTN_IMG25 "WIZARDS_HID_IS_BTN_IMG25" +#define HID_IS_BTN_IMG26 "WIZARDS_HID_IS_BTN_IMG26" +#define HID_IS_BTN_IMG27 "WIZARDS_HID_IS_BTN_IMG27" +#define HID_IS_BTN_IMG28 "WIZARDS_HID_IS_BTN_IMG28" +#define HID_IS_BTN_IMG29 "WIZARDS_HID_IS_BTN_IMG29" +#define HID_IS_BTN_IMG30 "WIZARDS_HID_IS_BTN_IMG30" +#define HID_IS_BTN_IMG31 "WIZARDS_HID_IS_BTN_IMG31" +#define HID_IS_BTN_IMG32 "WIZARDS_HID_IS_BTN_IMG32" + +// web wizard ftp dialog +#define HID_FTP "WIZARDS_HID_FTP" +#define HID_FTP_SERVER "WIZARDS_HID_FTP_SERVER" +#define HID_FTP_USERNAME "WIZARDS_HID_FTP_USERNAME" +#define HID_FTP_PASS "WIZARDS_HID_FTP_PASS" +#define HID_FTP_TEST "WIZARDS_HID_FTP_TEST" +#define HID_FTP_TXT_PATH "WIZARDS_HID_FTP_TXT_PATH" +#define HID_FTP_BTN_PATH "WIZARDS_HID_FTP_BTN_PATH" +#define HID_FTP_OK "WIZARDS_HID_FTP_OK" +#define HID_FTP_CANCEL "WIZARDS_HID_FTP_CANCEL" + + +/* ==================================== + * AGENDA WIZARD + * 41051 - 41099 + * ==================================== + */ + +// step 0 - navibar + +#define HID_AGWIZ "WIZARDS_HID_AGWIZ" +#define HID_AGWIZ_HELP "WIZARDS_HID_AGWIZ_HELP" +#define HID_AGWIZ_NEXT "WIZARDS_HID_AGWIZ_NEXT" +#define HID_AGWIZ_PREV "WIZARDS_HID_AGWIZ_PREV" +#define HID_AGWIZ_CREATE "WIZARDS_HID_AGWIZ_CREATE" +#define HID_AGWIZ_CANCEL "WIZARDS_HID_AGWIZ_CANCEL" + +//step 1 - design + +#define HID_AGWIZ_1_LIST_PAGEDESIGN "WIZARDS_HID_AGWIZ_1_LIST_PAGEDESIGN" +#define HID_AGWIZ_1_CHK_MINUTES "WIZARDS_HID_AGWIZ_1_CHK_MINUTES" + +// step 2 - general attributes + +#define HID_AGWIZ_2_TXT_TIME "WIZARDS_HID_AGWIZ_2_TXT_TIME" +#define HID_AGWIZ_2_TXT_DATE "WIZARDS_HID_AGWIZ_2_TXT_DATE" +#define HID_AGWIZ_2_TXT_TITLE "WIZARDS_HID_AGWIZ_2_TXT_TITLE" +#define HID_AGWIZ_2_TXT_LOCATION "WIZARDS_HID_AGWIZ_2_TXT_LOCATION" + +// step 3 - headings + +#define HID_AGWIZ_3_CHK_MEETING_TYPE "WIZARDS_HID_AGWIZ_3_CHK_MEETING_TYPE" +#define HID_AGWIZ_3_CHK_READ "WIZARDS_HID_AGWIZ_3_CHK_READ" +#define HID_AGWIZ_3_CHK_BRING "WIZARDS_HID_AGWIZ_3_CHK_BRING" +#define HID_AGWIZ_3_CHK_NOTES "WIZARDS_HID_AGWIZ_3_CHK_NOTES" + +// step 4 - names + +#define HID_AGWIZ_4_CHK_CALLED_BY "WIZARDS_HID_AGWIZ_4_CHK_CALLED_BY" +#define HID_AGWIZ_4_CHK_FACILITATOR "WIZARDS_HID_AGWIZ_4_CHK_FACILITATOR" +#define HID_AGWIZ_4_CHK_NOTETAKER "WIZARDS_HID_AGWIZ_4_CHK_NOTETAKER" +#define HID_AGWIZ_4_CHK_TIMEKEEPER "WIZARDS_HID_AGWIZ_4_CHK_TIMEKEEPER" +#define HID_AGWIZ_4_CHK_ATTENDEES "WIZARDS_HID_AGWIZ_4_CHK_ATTENDEES" +#define HID_AGWIZ_4_CHK_OBSERVERS "WIZARDS_HID_AGWIZ_4_CHK_OBSERVERS" +#define HID_AGWIZ_4_CHK_RESOURCEPERSONS "WIZARDS_HID_AGWIZ_4_CHK_RESOURCEPERSONS" + +// step 5 - topics + +#define HID_AGWIZ_6_TXT_TEMPLATENAME "WIZARDS_HID_AGWIZ_6_TXT_TEMPLATENAME" +#define HID_AGWIZ_6_TXT_TEMPLATEPATH "WIZARDS_HID_AGWIZ_6_TXT_TEMPLATEPATH" +#define HID_AGWIZ_6_BTN_TEMPLATEPATH "WIZARDS_HID_AGWIZ_6_BTN_TEMPLATEPATH" + +// step 6 - file info + +#define HID_AGWIZ_6_OPT_CREATEAGENDA "WIZARDS_HID_AGWIZ_6_OPT_CREATEAGENDA" +#define HID_AGWIZ_6_OPT_MAKECHANGES "WIZARDS_HID_AGWIZ_6_OPT_MAKECHANGES" + +// - again step 5 - buttons + +#define HID_AGWIZ_5_BTN_INSERT "WIZARDS_HID_AGWIZ_5_BTN_INSERT" +#define HID_AGWIZ_5_BTN_REMOVE "WIZARDS_HID_AGWIZ_5_BTN_REMOVE" +#define HID_AGWIZ_5_BTN_UP "WIZARDS_HID_AGWIZ_5_BTN_UP" +#define HID_AGWIZ_5_BTN_DOWN "WIZARDS_HID_AGWIZ_5_BTN_DOWN" + +// again step 5 - scroll control + +#define HID_AGWIZ_5_SCROLL_BAR "WIZARDS_HID_AGWIZ_5_SCROLL_BAR" + +#define HID_AGWIZ_5_TXT_TOPIC_1 "WIZARDS_HID_AGWIZ_5_TXT_TOPIC_1" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_1 "WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_1" +#define HID_AGWIZ_5_TXT_MINUTES_1 "WIZARDS_HID_AGWIZ_5_TXT_MINUTES_1" + +#define HID_AGWIZ_5_TXT_TOPIC_2 "WIZARDS_HID_AGWIZ_5_TXT_TOPIC_2" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_2 "WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_2" +#define HID_AGWIZ_5_TXT_MINUTES_2 "WIZARDS_HID_AGWIZ_5_TXT_MINUTES_2" + +#define HID_AGWIZ_5_TXT_TOPIC_3 "WIZARDS_HID_AGWIZ_5_TXT_TOPIC_3" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_3 "WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_3" +#define HID_AGWIZ_5_TXT_MINUTES_3 "WIZARDS_HID_AGWIZ_5_TXT_MINUTES_3" + +#define HID_AGWIZ_5_TXT_TOPIC_4 "WIZARDS_HID_AGWIZ_5_TXT_TOPIC_4" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_4 "WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_4" +#define HID_AGWIZ_5_TXT_MINUTES_4 "WIZARDS_HID_AGWIZ_5_TXT_MINUTES_4" + +#define HID_AGWIZ_5_TXT_TOPIC_5 "WIZARDS_HID_AGWIZ_5_TXT_TOPIC_5" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_5 "WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_5" +#define HID_AGWIZ_5_TXT_MINUTES_5 "WIZARDS_HID_AGWIZ_5_TXT_MINUTES_5" + + +//FaxWizard--------------------------- + +#define HID_FAXWIZ_OPTBUSINESSFAX "WIZARDS_HID_FAXWIZ_OPTBUSINESSFAX" +#define HID_FAXWIZ_LSTBUSINESSSTYLE "WIZARDS_HID_FAXWIZ_LSTBUSINESSSTYLE" +#define HID_FAXWIZ_OPTPRIVATEFAX "WIZARDS_HID_FAXWIZ_OPTPRIVATEFAX" +#define HID_LSTPRIVATESTYLE "WIZARDS_HID_LSTPRIVATESTYLE" +#define HID_IMAGECONTROL3 "WIZARDS_HID_IMAGECONTROL3" +#define HID_CHKUSELOGO "WIZARDS_HID_CHKUSELOGO" +#define HID_CHKUSEDATE "WIZARDS_HID_CHKUSEDATE" +#define HID_CHKUSECOMMUNICATIONTYPE "WIZARDS_HID_CHKUSECOMMUNICATIONTYPE" +#define HID_LSTCOMMUNICATIONTYPE "WIZARDS_HID_LSTCOMMUNICATIONTYPE" +#define HID_CHKUSESUBJECT "WIZARDS_HID_CHKUSESUBJECT" +#define HID_CHKUSESALUTATION "WIZARDS_HID_CHKUSESALUTATION" +#define HID_LSTSALUTATION "WIZARDS_HID_LSTSALUTATION" +#define HID_CHKUSEGREETING "WIZARDS_HID_CHKUSEGREETING" +#define HID_LSTGREETING "WIZARDS_HID_LSTGREETING" +#define HID_CHKUSEFOOTER "WIZARDS_HID_CHKUSEFOOTER" +#define HID_OPTSENDERPLACEHOLDER "WIZARDS_HID_OPTSENDERPLACEHOLDER" +#define HID_OPTSENDERDEFINE "WIZARDS_HID_OPTSENDERDEFINE" +#define HID_TXTSENDERNAME "WIZARDS_HID_TXTSENDERNAME" +#define HID_TXTSENDERSTREET "WIZARDS_HID_TXTSENDERSTREET" +#define HID_TXTSENDERPOSTCODE "WIZARDS_HID_TXTSENDERPOSTCODE" +#define HID_TXTSENDERSTATE "WIZARDS_HID_TXTSENDERSTATE" +#define HID_TXTSENDERCITY "WIZARDS_HID_TXTSENDERCITY" +#define HID_TXTSENDERFAX "WIZARDS_HID_TXTSENDERFAX" +#define HID_OPTRECEIVERPLACEHOLDER "WIZARDS_HID_OPTRECEIVERPLACEHOLDER" +#define HID_OPTRECEIVERDATABASE "WIZARDS_HID_OPTRECEIVERDATABASE" +#define HID_TXTFOOTER "WIZARDS_HID_TXTFOOTER" +#define HID_CHKFOOTERNEXTPAGES "WIZARDS_HID_CHKFOOTERNEXTPAGES" +#define HID_CHKFOOTERPAGENUMBERS "WIZARDS_HID_CHKFOOTERPAGENUMBERS" +#define HID_TXTTEMPLATENAME "WIZARDS_HID_TXTTEMPLATENAME" +#define HID_FILETEMPLATEPATH "WIZARDS_HID_FILETEMPLATEPATH" +#define HID_OPTCREATEFAX "WIZARDS_HID_OPTCREATEFAX" +#define HID_OPTMAKECHANGES "WIZARDS_HID_OPTMAKECHANGES" +#define HID_IMAGECONTROL2 "WIZARDS_HID_IMAGECONTROL2" +#define HID_FAXWIZ_TXTPATH "WIZARDS_HID_FAXWIZ_TXTPATH" +#define HID_FAXWIZ_CMDPATH "WIZARDS_HID_FAXWIZ_CMDPATH" + +#define HID_FAXWIZARD "WIZARDS_HID_FAXWIZARD" +#define HID_FAXWIZARD_HELP "WIZARDS_HID_FAXWIZARD_HELP" +#define HID_FAXWIZARD_BACK "WIZARDS_HID_FAXWIZARD_BACK" +#define HID_FAXWIZARD_NEXT "WIZARDS_HID_FAXWIZARD_NEXT" +#define HID_FAXWIZARD_CREATE "WIZARDS_HID_FAXWIZARD_CREATE" +#define HID_FAXWIZARD_CANCEL "WIZARDS_HID_FAXWIZARD_CANCEL" + + + +/* ==================================== + * TableWizard + * ==================================== + */ + +#define HID_DLGTABLE_DIALOG "WIZARDS_HID_DLGTABLE_DIALOG" +#define HID_DLGTABLE_CMDPREV "WIZARDS_HID_DLGTABLE_CMDPREV" +#define HID_DLGTABLE_CMDNEXT "WIZARDS_HID_DLGTABLE_CMDNEXT" +#define HID_DLGTABLE_CMDFINISH "WIZARDS_HID_DLGTABLE_CMDFINISH" +#define HID_DLGTABLE_CMDCANCEL "WIZARDS_HID_DLGTABLE_CMDCANCEL" + + +#define HID_DLGTABLE_OPTBUSINESS "WIZARDS_HID_DLGTABLE_OPTBUSINESS" +#define HID_DLGTABLE_OPTPRIVATE "WIZARDS_HID_DLGTABLE_OPTPRIVATE" + + +#define HID_DLGTABLE_LBTABLES "WIZARDS_HID_DLGTABLE_LBTABLES" +#define HID_DLGTABLE_FIELDSAVAILABLE "WIZARDS_HID_DLGTABLE_FIELDSAVAILABLE" +#define HID_DLGTABLE_CMDMOVESELECTED "WIZARDS_HID_DLGTABLE_CMDMOVESELECTED" +#define HID_DLGTABLE_CMDMOVEALL "WIZARDS_HID_DLGTABLE_CMDMOVEALL" +#define HID_DLGTABLE_CMDREMOVESELECTED "WIZARDS_HID_DLGTABLE_CMDREMOVESELECTED" +#define HID_DLGTABLE_CMDREMOVEALL "WIZARDS_HID_DLGTABLE_CMDREMOVEALL" +#define HID_DLGTABLE_FIELDSSELECTED "WIZARDS_HID_DLGTABLE_FIELDSSELECTED" + +#define HID_DLGTABLE_CMDMOVEUP "WIZARDS_HID_DLGTABLE_CMDMOVEUP" +#define HID_DLGTABLE_CMDMOVEDOWN "WIZARDS_HID_DLGTABLE_CMDMOVEDOWN" + + +#define HID_DLGTABLE_LB_SELFIELDNAMES "WIZARDS_HID_DLGTABLE_LB_SELFIELDNAMES" +#define HID_DLGTABLE_CMDMOVEFIELDUP "WIZARDS_HID_DLGTABLE_CMDMOVEFIELDUP" +#define HID_DLGTABLE_CMDMOVEFIELDDOWN "WIZARDS_HID_DLGTABLE_CMDMOVEFIELDDOWN" +#define HID_DLGTABLE_CMDMINUS "WIZARDS_HID_DLGTABLE_CMDMINUS" +#define HID_DLGTABLE_CMDPLUS "WIZARDS_HID_DLGTABLE_CMDPLUS" +#define HID_DLGTABLE_COLNAME "WIZARDS_HID_DLGTABLE_COLNAME" +#define HID_DLGTABLE_COLMODIFIER "WIZARDS_HID_DLGTABLE_COLMODIFIER" + + +#define HID_DLGTABLE_CHK_USEPRIMEKEY "WIZARDS_HID_DLGTABLE_CHK_USEPRIMEKEY" +#define HID_DLGTABLE_OPT_PK_AUTOMATIC "WIZARDS_HID_DLGTABLE_OPT_PK_AUTOMATIC" + +#define HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC "WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC" + +#define HID_DLGTABLE_OPT_PK_SINGLE "WIZARDS_HID_DLGTABLE_OPT_PK_SINGLE" +#define HID_DLGTABLE_LB_PK_FIELDNAME "WIZARDS_HID_DLGTABLE_LB_PK_FIELDNAME" +#define HID_DLGTABLE_CK_PK_AUTOVALUE "WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE" +#define HID_DLGTABLE_OPT_PK_SEVERAL "WIZARDS_HID_DLGTABLE_OPT_PK_SEVERAL" +#define HID_DLGTABLE_FIELDS_PK_AVAILABLE "WIZARDS_HID_DLGTABLE_FIELDS_PK_AVAILABLE" +#define HID_DLGTABLE_CMDMOVE_PK_SELECTED "WIZARDS_HID_DLGTABLE_CMDMOVE_PK_SELECTED" +#define HID_DLGTABLE_CMDREMOVE_PK_SELECTED "WIZARDS_HID_DLGTABLE_CMDREMOVE_PK_SELECTED" +#define HID_DLGTABLE_FIELDS_PK_SELECTED "WIZARDS_HID_DLGTABLE_FIELDS_PK_SELECTED" + +#define HID_DLGTABLE_CMDMOVEUP_PK_SELECTED "WIZARDS_HID_DLGTABLE_CMDMOVEUP_PK_SELECTED" +#define HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED "WIZARDS_HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED" + + + + +#define HID_DLGTABLE_TXT_NAME "WIZARDS_HID_DLGTABLE_TXT_NAME" +#define HID_DLGTABLE_OPT_MODIFYTABLE "WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE" +#define HID_DLGTABLE_OPT_WORKWITHTABLE "WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE" +#define HID_DLGTABLE_OPT_STARTFORMWIZARD "WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD" +#define HID_DLGTABLE_LST_CATALOG "WIZARDS_HID_DLGTABLE_LST_CATALOG" +#define HID_DLGTABLE_LST_SCHEMA "WIZARDS_HID_DLGTABLE_LST_SCHEMA" + + + + +//End at 42767 diff --git a/wizards/util/hidother.src b/wizards/util/hidother.src index 912d9d49d..bf1953e06 100644 --- a/wizards/util/hidother.src +++ b/wizards/util/hidother.src @@ -28,6 +28,7 @@ //34200 - 34767 //40768 - 42767 +#include "helpids.h" /* * web wizard : 34200 - 34319 * report wizard : 34320 - 34399 @@ -45,205 +46,205 @@ // *************** //webwizardgeneralcontrols -#define HID0_WEBWIZARD 34200 +// #define HID0_WEBWIZARD 34200 hidspecial HID { HelpID = HID0_WEBWIZARD; } ; -#define HID0_HELP 34201 +// #define HID0_HELP 34201 hidspecial HID { HelpID = HID0_HELP; } ; -#define HID0_NEXT 34202 +// #define HID0_NEXT 34202 hidspecial HID { HelpID = HID0_NEXT; } ; -#define HID0_PREV 34203 +// #define HID0_PREV 34203 hidspecial HID { HelpID = HID0_PREV; } ; -#define HID0_CREATE 34204 +// #define HID0_CREATE 34204 hidspecial HID { HelpID = HID0_CREATE; } ; -#define HID0_CANCEL 34205 +// #define HID0_CANCEL 34205 hidspecial HID { HelpID = HID0_CANCEL; } ; -#define HID0_STATUS_DIALOG 34206 +// #define HID0_STATUS_DIALOG 34206 hidspecial HID { HelpID = HID0_STATUS_DIALOG; } ; //step1 -#define HID1_LST_SESSIONS 34207 +// #define HID1_LST_SESSIONS 34207 hidspecial HID { HelpID = HID1_LST_SESSIONS; } ; -#define HID1_BTN_DEL_SES 34209 +// #define HID1_BTN_DEL_SES 34209 hidspecial HID { HelpID = HID1_BTN_DEL_SES; } ; //step2 -#define HID2_LST_DOCS 34210 +// #define HID2_LST_DOCS 34210 hidspecial HID { HelpID = HID2_LST_DOCS; } ; -#define HID2_BTN_ADD_DOC 34211 +// #define HID2_BTN_ADD_DOC 34211 hidspecial HID { HelpID = HID2_BTN_ADD_DOC; } ; -#define HID2_BTN_REM_DOC 34212 +// #define HID2_BTN_REM_DOC 34212 hidspecial HID { HelpID = HID2_BTN_REM_DOC; } ; -#define HID2_BTN_DOC_UP 34213 +// #define HID2_BTN_DOC_UP 34213 hidspecial HID { HelpID = HID2_BTN_DOC_UP; } ; -#define HID2_BTN_DOC_DOWN 34214 +// #define HID2_BTN_DOC_DOWN 34214 hidspecial HID { HelpID = HID2_BTN_DOC_DOWN; } ; -#define HID2_TXT_DOC_TITLE 34215 +// #define HID2_TXT_DOC_TITLE 34215 hidspecial HID { HelpID = HID2_TXT_DOC_TITLE; } ; -#define HID2_TXT_DOC_DESC 34216 +// #define HID2_TXT_DOC_DESC 34216 hidspecial HID { HelpID = HID2_TXT_DOC_DESC; } ; -#define HID2_TXT_DOC_AUTHOR 34217 +// #define HID2_TXT_DOC_AUTHOR 34217 hidspecial HID { HelpID = HID2_TXT_DOC_AUTHOR; } ; -#define HID2_LST_DOC_EXPORT 34218 +// #define HID2_LST_DOC_EXPORT 34218 hidspecial HID { HelpID = HID2_LST_DOC_EXPORT; } ; -#define HID2_STATUS_ADD_DOCS 34219 +// #define HID2_STATUS_ADD_DOCS 34219 hidspecial HID { HelpID = HID2_STATUS_ADD_DOCS; } ; //step3 -#define HID3_IL_LAYOUTS_IMG1 34220 +// #define HID3_IL_LAYOUTS_IMG1 34220 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG1; } ; -#define HID3_IL_LAYOUTS_IMG2 34221 +// #define HID3_IL_LAYOUTS_IMG2 34221 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG2; } ; -#define HID3_IL_LAYOUTS_IMG3 34222 +// #define HID3_IL_LAYOUTS_IMG3 34222 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG3; } ; -#define HID3_IL_LAYOUTS_IMG4 34223 +// #define HID3_IL_LAYOUTS_IMG4 34223 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG4; } ; -#define HID3_IL_LAYOUTS_IMG5 34224 +// #define HID3_IL_LAYOUTS_IMG5 34224 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG5; } ; -#define HID3_IL_LAYOUTS_IMG6 34225 +// #define HID3_IL_LAYOUTS_IMG6 34225 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG6; } ; -#define HID3_IL_LAYOUTS_IMG7 34226 +// #define HID3_IL_LAYOUTS_IMG7 34226 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG7; } ; -#define HID3_IL_LAYOUTS_IMG8 34227 +// #define HID3_IL_LAYOUTS_IMG8 34227 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG8; } ; -#define HID3_IL_LAYOUTS_IMG9 34228 +// #define HID3_IL_LAYOUTS_IMG9 34228 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG9; } ; -#define HID3_IL_LAYOUTS_IMG10 34229 +// #define HID3_IL_LAYOUTS_IMG10 34229 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG10; } ; -#define HID3_IL_LAYOUTS_IMG11 34230 +// #define HID3_IL_LAYOUTS_IMG11 34230 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG11; } ; -#define HID3_IL_LAYOUTS_IMG12 34231 +// #define HID3_IL_LAYOUTS_IMG12 34231 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG12; } ; -#define HID3_IL_LAYOUTS_IMG13 34232 +// #define HID3_IL_LAYOUTS_IMG13 34232 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG13; } ; -#define HID3_IL_LAYOUTS_IMG14 34233 +// #define HID3_IL_LAYOUTS_IMG14 34233 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG14; } ; -#define HID3_IL_LAYOUTS_IMG15 34234 +// #define HID3_IL_LAYOUTS_IMG15 34234 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG15; } ; //step4 -#define HID4_CHK_DISPLAY_FILENAME 34235 +// #define HID4_CHK_DISPLAY_FILENAME 34235 hidspecial HID { HelpID = HID4_CHK_DISPLAY_FILENAME; } ; -#define HID4_CHK_DISPLAY_DESCRIPTION 34236 +// #define HID4_CHK_DISPLAY_DESCRIPTION 34236 hidspecial HID { HelpID = HID4_CHK_DISPLAY_DESCRIPTION; } ; -#define HID4_CHK_DISPLAY_AUTHOR 34237 +// #define HID4_CHK_DISPLAY_AUTHOR 34237 hidspecial HID { HelpID = HID4_CHK_DISPLAY_AUTHOR; } ; -#define HID4_CHK_DISPLAY_CR_DATE 34238 +// #define HID4_CHK_DISPLAY_CR_DATE 34238 hidspecial HID { HelpID = HID4_CHK_DISPLAY_CR_DATE; } ; -#define HID4_CHK_DISPLAY_UP_DATE 34239 +// #define HID4_CHK_DISPLAY_UP_DATE 34239 hidspecial HID { HelpID = HID4_CHK_DISPLAY_UP_DATE; } ; -#define HID4_CHK_DISPLAY_FORMAT 34240 +// #define HID4_CHK_DISPLAY_FORMAT 34240 hidspecial HID { HelpID = HID4_CHK_DISPLAY_FORMAT; } ; -#define HID4_CHK_DISPLAY_F_ICON 34241 +// #define HID4_CHK_DISPLAY_F_ICON 34241 hidspecial HID { HelpID = HID4_CHK_DISPLAY_F_ICON; } ; -#define HID4_CHK_DISPLAY_PAGES 34242 +// #define HID4_CHK_DISPLAY_PAGES 34242 hidspecial HID { HelpID = HID4_CHK_DISPLAY_PAGES; } ; -#define HID4_CHK_DISPLAY_SIZE 34243 +// #define HID4_CHK_DISPLAY_SIZE 34243 hidspecial HID { HelpID = HID4_CHK_DISPLAY_SIZE; } ; -#define HID4_GRP_OPTIMAIZE_640 34244 +// #define HID4_GRP_OPTIMAIZE_640 34244 hidspecial HID { HelpID = HID4_GRP_OPTIMAIZE_640; } ; -#define HID4_GRP_OPTIMAIZE_800 34245 +// #define HID4_GRP_OPTIMAIZE_800 34245 hidspecial HID { HelpID = HID4_GRP_OPTIMAIZE_800; } ; -#define HID4_GRP_OPTIMAIZE_1024 34246 +// #define HID4_GRP_OPTIMAIZE_1024 34246 hidspecial HID { HelpID = HID4_GRP_OPTIMAIZE_1024; } ; //step5 -#define HID5_LST_STYLES 34247 +// #define HID5_LST_STYLES 34247 hidspecial HID { HelpID = HID5_LST_STYLES; } ; -#define HID5_BTN_BACKGND 34248 +// #define HID5_BTN_BACKGND 34248 hidspecial HID { HelpID = HID5_BTN_BACKGND; } ; -#define HID5_BTN_ICONS 34249 +// #define HID5_BTN_ICONS 34249 hidspecial HID { HelpID = HID5_BTN_ICONS; } ; //step6 -#define HID6_TXT_SITE_TITLE 34250 +// #define HID6_TXT_SITE_TITLE 34250 hidspecial HID { HelpID = HID6_TXT_SITE_TITLE; } ; -#define HID6_TXT_SITE_DESC 34253 +// #define HID6_TXT_SITE_DESC 34253 hidspecial HID { HelpID = HID6_TXT_SITE_DESC; } ; -#define HID6_DATE_SITE_CREATED 34255 +// #define HID6_DATE_SITE_CREATED 34255 hidspecial HID { HelpID = HID6_DATE_SITE_CREATED; } ; -#define HID6_DATE_SITE_UPDATED 34256 +// #define HID6_DATE_SITE_UPDATED 34256 hidspecial HID { HelpID = HID6_DATE_SITE_UPDATED; } ; -#define HID6_TXT_SITE_EMAIL 34258 +// #define HID6_TXT_SITE_EMAIL 34258 hidspecial HID { HelpID = HID6_TXT_SITE_EMAIL; } ; -#define HID6_TXT_SITE_COPYRIGHT 34259 +// #define HID6_TXT_SITE_COPYRIGHT 34259 hidspecial HID { HelpID = HID6_TXT_SITE_COPYRIGHT; } ; //step7 -#define HID7_BTN_PREVIEW 34260 +// #define HID7_BTN_PREVIEW 34260 hidspecial HID { HelpID = HID7_BTN_PREVIEW; } ; -#define HID7_CHK_PUBLISH_LOCAL 34261 +// #define HID7_CHK_PUBLISH_LOCAL 34261 hidspecial HID { HelpID = HID7_CHK_PUBLISH_LOCAL; } ; -#define HID7_TXT_LOCAL 34262 +// #define HID7_TXT_LOCAL 34262 hidspecial HID { HelpID = HID7_TXT_LOCAL; } ; -#define HID7_BTN_LOCAL 34263 +// #define HID7_BTN_LOCAL 34263 hidspecial HID { HelpID = HID7_BTN_LOCAL; } ; -#define HID7_CHK_PUBLISH_ZIP 34264 +// #define HID7_CHK_PUBLISH_ZIP 34264 hidspecial HID { HelpID = HID7_CHK_PUBLISH_ZIP; } ; -#define HID7_TXT_ZIP 34265 +// #define HID7_TXT_ZIP 34265 hidspecial HID { HelpID = HID7_TXT_ZIP; } ; -#define HID7_BTN_ZIP 34266 +// #define HID7_BTN_ZIP 34266 hidspecial HID { HelpID = HID7_BTN_ZIP; } ; -#define HID7_CHK_PUBLISH_FTP 34267 +// #define HID7_CHK_PUBLISH_FTP 34267 hidspecial HID { HelpID = HID7_CHK_PUBLISH_FTP; } ; -#define HID7_TXT_FTP 34268 +// #define HID7_TXT_FTP 34268 hidspecial HID { HelpID = HID7_TXT_FTP; } ; -#define HID7_BTN_FTP 34269 +// #define HID7_BTN_FTP 34269 hidspecial HID { HelpID = HID7_BTN_FTP; } ; -#define HID7_CHK_SAVE 34270 +// #define HID7_CHK_SAVE 34270 hidspecial HID { HelpID = HID7_CHK_SAVE; } ; -#define HID7_TXT_SAVE 34271 +// #define HID7_TXT_SAVE 34271 hidspecial HID { HelpID = HID7_TXT_SAVE; } ; //web wizard backgrounds dialog -#define HID_BG 34290 +// #define HID_BG 34290 hidspecial HID { HelpID = HID_BG; } ; -#define HID_BG_BTN_OTHER 34291 +// #define HID_BG_BTN_OTHER 34291 hidspecial HID { HelpID = HID_BG_BTN_OTHER; } ; -#define HID_BG_BTN_NONE 34292 +// #define HID_BG_BTN_NONE 34292 hidspecial HID { HelpID = HID_BG_BTN_NONE; } ; -#define HID_BG_BTN_OK 34293 +// #define HID_BG_BTN_OK 34293 hidspecial HID { HelpID = HID_BG_BTN_OK; } ; -#define HID_BG_BTN_CANCEL 34294 +// #define HID_BG_BTN_CANCEL 34294 hidspecial HID { HelpID = HID_BG_BTN_CANCEL; } ; -#define HID_BG_BTN_BACK 34295 +// #define HID_BG_BTN_BACK 34295 hidspecial HID { HelpID = HID_BG_BTN_BACK; } ; -#define HID_BG_BTN_FW 34296 +// #define HID_BG_BTN_FW 34296 hidspecial HID { HelpID = HID_BG_BTN_FW; } ; -#define HID_BG_BTN_IMG1 34297 +// #define HID_BG_BTN_IMG1 34297 hidspecial HID { HelpID = HID_BG_BTN_IMG1; } ; -#define HID_BG_BTN_IMG2 34298 +// #define HID_BG_BTN_IMG2 34298 hidspecial HID { HelpID = HID_BG_BTN_IMG2; } ; -#define HID_BG_BTN_IMG3 34299 +// #define HID_BG_BTN_IMG3 34299 hidspecial HID { HelpID = HID_BG_BTN_IMG3; } ; -#define HID_BG_BTN_IMG4 34300 +// #define HID_BG_BTN_IMG4 34300 hidspecial HID { HelpID = HID_BG_BTN_IMG4; } ; -#define HID_BG_BTN_IMG5 34301 +// #define HID_BG_BTN_IMG5 34301 hidspecial HID { HelpID = HID_BG_BTN_IMG5; } ; -#define HID_BG_BTN_IMG6 34302 +// #define HID_BG_BTN_IMG6 34302 hidspecial HID { HelpID = HID_BG_BTN_IMG6; } ; -#define HID_BG_BTN_IMG7 34303 +// #define HID_BG_BTN_IMG7 34303 hidspecial HID { HelpID = HID_BG_BTN_IMG7; } ; -#define HID_BG_BTN_IMG8 34304 +// #define HID_BG_BTN_IMG8 34304 hidspecial HID { HelpID = HID_BG_BTN_IMG8; } ; -#define HID_BG_BTN_IMG9 34305 +// #define HID_BG_BTN_IMG9 34305 hidspecial HID { HelpID = HID_BG_BTN_IMG9; } ; -#define HID_BG_BTN_IMG10 34306 +// #define HID_BG_BTN_IMG10 34306 hidspecial HID { HelpID = HID_BG_BTN_IMG10; } ; -#define HID_BG_BTN_IMG11 34307 +// #define HID_BG_BTN_IMG11 34307 hidspecial HID { HelpID = HID_BG_BTN_IMG11; } ; -#define HID_BG_BTN_IMG12 34308 +// #define HID_BG_BTN_IMG12 34308 hidspecial HID { HelpID = HID_BG_BTN_IMG12; } ; -#define HID_BG_BTN_IMG13 34309 +// #define HID_BG_BTN_IMG13 34309 hidspecial HID { HelpID = HID_BG_BTN_IMG13; } ; -#define HID_BG_BTN_IMG14 34300 +// #define HID_BG_BTN_IMG14 34300 hidspecial HID { HelpID = HID_BG_BTN_IMG14; } ; -#define HID_BG_BTN_IMG15 34311 +// #define HID_BG_BTN_IMG15 34311 hidspecial HID { HelpID = HID_BG_BTN_IMG15; } ; -#define HID_BG_BTN_IMG16 34312 +// #define HID_BG_BTN_IMG16 34312 hidspecial HID { HelpID = HID_BG_BTN_IMG16; } ; // ++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -255,118 +256,118 @@ hidspecial HID { HelpID = HID_BG_BTN_IMG16; } ; // REPORT WIZARD // ************* -#define HID_DLGREPORT_DIALOG 34320 +// #define HID_DLGREPORT_DIALOG 34320 hidspecial HID { HelpID = HID_DLGREPORT_DIALOG; }; -#define HID_DLGREPORT_0_CMDPREV 34322 +// #define HID_DLGREPORT_0_CMDPREV 34322 hidspecial HID { HelpID = HID_DLGREPORT_0_CMDPREV; }; -#define HID_DLGREPORT_0_CMDNEXT 34323 +// #define HID_DLGREPORT_0_CMDNEXT 34323 hidspecial HID { HelpID = HID_DLGREPORT_0_CMDNEXT; }; -#define HID_DLGREPORT_0_CMDFINISH 34324 +// #define HID_DLGREPORT_0_CMDFINISH 34324 hidspecial HID { HelpID = HID_DLGREPORT_0_CMDFINISH; }; -#define HID_DLGREPORT_0_CMDCANCEL 34325 +// #define HID_DLGREPORT_0_CMDCANCEL 34325 hidspecial HID { HelpID = HID_DLGREPORT_0_CMDCANCEL; }; -#define HID_DLGREPORT_1_LBTABLES 34330 +// #define HID_DLGREPORT_1_LBTABLES 34330 hidspecial HID { HelpID = HID_DLGREPORT_1_LBTABLES; }; -#define HID_DLGREPORT_1_FIELDSAVAILABLE 34331 +// #define HID_DLGREPORT_1_FIELDSAVAILABLE 34331 hidspecial HID { HelpID = HID_DLGREPORT_1_FIELDSAVAILABLE; }; -#define HID_DLGREPORT_1_CMDMOVESELECTED 34332 +// #define HID_DLGREPORT_1_CMDMOVESELECTED 34332 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVESELECTED; }; -#define HID_DLGREPORT_1_CMDMOVEALL 34333 +// #define HID_DLGREPORT_1_CMDMOVEALL 34333 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVEALL; }; -#define HID_DLGREPORT_1_CMDREMOVESELECTED 34334 +// #define HID_DLGREPORT_1_CMDREMOVESELECTED 34334 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDREMOVESELECTED; }; -#define HID_DLGREPORT_1_CMDREMOVEALL 34335 +// #define HID_DLGREPORT_1_CMDREMOVEALL 34335 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDREMOVEALL; }; -#define HID_DLGREPORT_1_FIELDSSELECTED 34336 +// #define HID_DLGREPORT_1_FIELDSSELECTED 34336 hidspecial HID { HelpID = HID_DLGREPORT_1_FIELDSSELECTED; }; -#define HID_DLGREPORT_1_CMDMOVEUP 34337 +// #define HID_DLGREPORT_1_CMDMOVEUP 34337 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVEUP; }; -#define HID_DLGREPORT_1_CMDMOVEDOWN 34338 +// #define HID_DLGREPORT_1_CMDMOVEDOWN 34338 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVEDOWN; }; -#define HID_DLGREPORT_2_GROUPING 34340 +// #define HID_DLGREPORT_2_GROUPING 34340 hidspecial HID { HelpID = HID_DLGREPORT_2_GROUPING; }; -#define HID_DLGREPORT_2_CMDGROUP 34341 +// #define HID_DLGREPORT_2_CMDGROUP 34341 hidspecial HID { HelpID = HID_DLGREPORT_2_CMDGROUP; }; -#define HID_DLGREPORT_2_CMDUNGROUP 34342 +// #define HID_DLGREPORT_2_CMDUNGROUP 34342 hidspecial HID { HelpID = HID_DLGREPORT_2_CMDUNGROUP; }; -#define HID_DLGREPORT_2_PREGROUPINGDEST 34343 +// #define HID_DLGREPORT_2_PREGROUPINGDEST 34343 hidspecial HID { HelpID = HID_DLGREPORT_2_PREGROUPINGDEST; }; -#define HID_DLGREPORT_2_CMDMOVEUPGROUP 34344 +// #define HID_DLGREPORT_2_CMDMOVEUPGROUP 34344 hidspecial HID { HelpID = HID_DLGREPORT_2_CMDMOVEUPGROUP; }; -#define HID_DLGREPORT_2_CMDMOVEDOWNGROUP 34345 +// #define HID_DLGREPORT_2_CMDMOVEDOWNGROUP 34345 hidspecial HID { HelpID = HID_DLGREPORT_2_CMDMOVEDOWNGROUP; }; -#define HID_DLGREPORT_3_SORT1 34346 +// #define HID_DLGREPORT_3_SORT1 34346 hidspecial HID { HelpID = HID_DLGREPORT_3_SORT1; }; -#define HID_DLGREPORT_3_OPTASCEND1 34347 +// #define HID_DLGREPORT_3_OPTASCEND1 34347 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND1; }; -#define HID_DLGREPORT_3_OPTDESCEND1 34348 +// #define HID_DLGREPORT_3_OPTDESCEND1 34348 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND1; }; -#define HID_DLGREPORT_3_SORT2 34349 +// #define HID_DLGREPORT_3_SORT2 34349 hidspecial HID { HelpID = HID_DLGREPORT_3_SORT2; }; -#define HID_DLGREPORT_3_OPTASCEND2 34350 +// #define HID_DLGREPORT_3_OPTASCEND2 34350 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND2; }; -#define HID_DLGREPORT_3_OPTDESCEND2 34351 +// #define HID_DLGREPORT_3_OPTDESCEND2 34351 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND2; }; -#define HID_DLGREPORT_3_SORT3 34352 +// #define HID_DLGREPORT_3_SORT3 34352 hidspecial HID { HelpID = HID_DLGREPORT_3_SORT3; }; -#define HID_DLGREPORT_3_OPTASCEND3 34353 +// #define HID_DLGREPORT_3_OPTASCEND3 34353 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND3; }; -#define HID_DLGREPORT_3_OPTDESCEND3 34354 +// #define HID_DLGREPORT_3_OPTDESCEND3 34354 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND3; }; -#define HID_DLGREPORT_3_SORT4 34355 +// #define HID_DLGREPORT_3_SORT4 34355 hidspecial HID { HelpID = HID_DLGREPORT_3_SORT4; }; -#define HID_DLGREPORT_3_OPTASCEND4 34356 +// #define HID_DLGREPORT_3_OPTASCEND4 34356 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND4; }; -#define HID_DLGREPORT_3_OPTDESCEND4 34357 +// #define HID_DLGREPORT_3_OPTDESCEND4 34357 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND4; }; -#define HID_DLGREPORT_4_TITLE 34362 +// #define HID_DLGREPORT_4_TITLE 34362 hidspecial HID { HelpID = HID_DLGREPORT_4_TITLE; }; -#define HID_DLGREPORT_4_DATALAYOUT 34363 +// #define HID_DLGREPORT_4_DATALAYOUT 34363 hidspecial HID { HelpID = HID_DLGREPORT_4_DATALAYOUT; }; -#define HID_DLGREPORT_4_PAGELAYOUT 34364 +// #define HID_DLGREPORT_4_PAGELAYOUT 34364 hidspecial HID { HelpID = HID_DLGREPORT_4_PAGELAYOUT; }; -#define HID_DLGREPORT_4_LANDSCAPE 34365 +// #define HID_DLGREPORT_4_LANDSCAPE 34365 hidspecial HID { HelpID = HID_DLGREPORT_4_LANDSCAPE; }; -#define HID_DLGREPORT_4_PORTRAIT 34366 +// #define HID_DLGREPORT_4_PORTRAIT 34366 hidspecial HID { HelpID = HID_DLGREPORT_4_PORTRAIT; }; -#define HID_DLGREPORT_5_OPTDYNTEMPLATE 34370 +// #define HID_DLGREPORT_5_OPTDYNTEMPLATE 34370 hidspecial HID { HelpID = HID_DLGREPORT_5_OPTDYNTEMPLATE; }; -#define HID_DLGREPORT_5_OPTSTATDOCUMENT 34371 +// #define HID_DLGREPORT_5_OPTSTATDOCUMENT 34371 hidspecial HID { HelpID = HID_DLGREPORT_5_OPTSTATDOCUMENT; }; -#define HID_DLGREPORT_5_TXTTEMPLATEPATH 34372 +// #define HID_DLGREPORT_5_TXTTEMPLATEPATH 34372 hidspecial HID { HelpID = HID_DLGREPORT_5_TXTTEMPLATEPATH; }; -#define HID_DLGREPORT_5_CMDTEMPLATEPATH 34373 +// #define HID_DLGREPORT_5_CMDTEMPLATEPATH 34373 hidspecial HID { HelpID = HID_DLGREPORT_5_CMDTEMPLATEPATH; }; -#define HID_DLGREPORT_5_OPTEDITTEMPLATE 34374 +// #define HID_DLGREPORT_5_OPTEDITTEMPLATE 34374 hidspecial HID { HelpID = HID_DLGREPORT_5_OPTEDITTEMPLATE; }; -#define HID_DLGREPORT_5_OPTUSETEMPLATE 34375 +// #define HID_DLGREPORT_5_OPTUSETEMPLATE 34375 hidspecial HID { HelpID = HID_DLGREPORT_5_OPTUSETEMPLATE; }; -#define HID_DLGREPORT_5_TXTDOCUMENTPATH 34376 +// #define HID_DLGREPORT_5_TXTDOCUMENTPATH 34376 hidspecial HID { HelpID = HID_DLGREPORT_5_TXTDOCUMENTPATH; }; -#define HID_DLGREPORT_5_CMDDOCUMENTPATH 34377 +// #define HID_DLGREPORT_5_CMDDOCUMENTPATH 34377 hidspecial HID { HelpID = HID_DLGREPORT_5_CMDDOCUMENTPATH; }; -#define HID_DLGREPORT_5_CHKLINKTODB 34378 +// #define HID_DLGREPORT_5_CHKLINKTODB 34378 hidspecial HID { HelpID = HID_DLGREPORT_5_CHKLINKTODB; }; -#define HID_DLGREPORT_6_TXTTITLE_1 34381 +// #define HID_DLGREPORT_6_TXTTITLE_1 34381 hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_1; }; -#define HID_DLGREPORT_6_TXTTITLE_2 34382 +// #define HID_DLGREPORT_6_TXTTITLE_2 34382 hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_2; }; -#define HID_DLGREPORT_6_TXTTITLE_3 34383 +// #define HID_DLGREPORT_6_TXTTITLE_3 34383 hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_3; }; -#define HID_DLGREPORT_6_TXTTITLE_4 34384 +// #define HID_DLGREPORT_6_TXTTITLE_4 34384 hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_4; }; -#define HID_DLGREPORT_6_TXTTITLE_5 34385 +// #define HID_DLGREPORT_6_TXTTITLE_5 34385 hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_5; }; -#define HID_DLGREPORT_6_TXTTITLE_6 34386 +// #define HID_DLGREPORT_6_TXTTITLE_6 34386 hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_6; }; -#define HID_DLGREPORT_6_TXTTITLE_7 34387 +// #define HID_DLGREPORT_6_TXTTITLE_7 34387 hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_7; }; @@ -376,408 +377,408 @@ hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_7; }; */ -#define HID_DLGFORM_DIALOG 34400 +// #define HID_DLGFORM_DIALOG 34400 hidspecial HID { HelpID = HID_DLGFORM_DIALOG; }; -#define HID_DLGFORM_CMDPREV 34402 +// #define HID_DLGFORM_CMDPREV 34402 hidspecial HID { HelpID = HID_DLGFORM_CMDPREV; }; -#define HID_DLGFORM_CMDNEXT 34403 +// #define HID_DLGFORM_CMDNEXT 34403 hidspecial HID { HelpID = HID_DLGFORM_CMDNEXT; }; -#define HID_DLGFORM_CMDFINISH 34404 +// #define HID_DLGFORM_CMDFINISH 34404 hidspecial HID { HelpID = HID_DLGFORM_CMDFINISH; }; -#define HID_DLGFORM_CMDCANCEL 34405 +// #define HID_DLGFORM_CMDCANCEL 34405 hidspecial HID { HelpID = HID_DLGFORM_CMDCANCEL; }; -#define HID_DLGFORM_MASTER_LBTABLES 34411 +// #define HID_DLGFORM_MASTER_LBTABLES 34411 hidspecial HID { HelpID = HID_DLGFORM_MASTER_LBTABLES; }; -#define HID_DLGFORM_MASTER_FIELDSAVAILABLE 34412 +// #define HID_DLGFORM_MASTER_FIELDSAVAILABLE 34412 hidspecial HID { HelpID = HID_DLGFORM_MASTER_FIELDSAVAILABLE; }; -#define HID_DLGFORM_MASTER_CMDMOVESELECTED 34413 +// #define HID_DLGFORM_MASTER_CMDMOVESELECTED 34413 hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVESELECTED; }; -#define HID_DLGFORM_MASTER_CMDMOVEALL 34414 +// #define HID_DLGFORM_MASTER_CMDMOVEALL 34414 hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVEALL; }; -#define HID_DLGFORM_MASTER_CMDREMOVESELECTED 34415 +// #define HID_DLGFORM_MASTER_CMDREMOVESELECTED 34415 hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDREMOVESELECTED; }; -#define HID_DLGFORM_MASTER_CMDREMOVEALL 34416 +// #define HID_DLGFORM_MASTER_CMDREMOVEALL 34416 hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDREMOVEALL; }; -#define HID_DLGFORM_MASTER_FIELDSSELECTED 34417 +// #define HID_DLGFORM_MASTER_FIELDSSELECTED 34417 hidspecial HID { HelpID = HID_DLGFORM_MASTER_FIELDSSELECTED; }; -#define HID_DLGFORM_MASTER_CMDMOVEUP 34418 +// #define HID_DLGFORM_MASTER_CMDMOVEUP 34418 hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVEUP; }; -#define HID_DLGFORM_MASTER_CMDMOVEDOWN 34419 +// #define HID_DLGFORM_MASTER_CMDMOVEDOWN 34419 hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVEDOWN; }; -#define HID_DLGFORM_CHKCREATESUBFORM 34421 +// #define HID_DLGFORM_CHKCREATESUBFORM 34421 hidspecial HID { HelpID = HID_DLGFORM_CHKCREATESUBFORM; }; -#define HID_DLGFORM_OPTONEXISTINGRELATION 34422 +// #define HID_DLGFORM_OPTONEXISTINGRELATION 34422 hidspecial HID { HelpID = HID_DLGFORM_OPTONEXISTINGRELATION; }; -#define HID_DLGFORM_OPTSELECTMANUALLY 34423 +// #define HID_DLGFORM_OPTSELECTMANUALLY 34423 hidspecial HID { HelpID = HID_DLGFORM_OPTSELECTMANUALLY; }; -#define HID_DLGFORM_lstRELATIONS 34424 +// #define HID_DLGFORM_lstRELATIONS 34424 hidspecial HID { HelpID = HID_DLGFORM_lstRELATIONS; }; -#define HID_DLGFORM_SUB_LBTABLES 34431 +// #define HID_DLGFORM_SUB_LBTABLES 34431 hidspecial HID { HelpID = HID_DLGFORM_SUB_LBTABLES; }; -#define HID_DLGFORM_SUB_FIELDSAVAILABLE 34432 +// #define HID_DLGFORM_SUB_FIELDSAVAILABLE 34432 hidspecial HID { HelpID = HID_DLGFORM_SUB_FIELDSAVAILABLE; }; -#define HID_DLGFORM_SUB_CMDMOVESELECTED 34433 +// #define HID_DLGFORM_SUB_CMDMOVESELECTED 34433 hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVESELECTED; }; -#define HID_DLGFORM_SUB_CMDMOVEALL 34434 +// #define HID_DLGFORM_SUB_CMDMOVEALL 34434 hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVEALL; }; -#define HID_DLGFORM_SUB_CMDREMOVESELECTED 34435 +// #define HID_DLGFORM_SUB_CMDREMOVESELECTED 34435 hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDREMOVESELECTED; }; -#define HID_DLGFORM_SUB_CMDREMOVEALL 34436 +// #define HID_DLGFORM_SUB_CMDREMOVEALL 34436 hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDREMOVEALL; }; -#define HID_DLGFORM_SUB_FIELDSSELECTED 34437 +// #define HID_DLGFORM_SUB_FIELDSSELECTED 34437 hidspecial HID { HelpID = HID_DLGFORM_SUB_FIELDSSELECTED; }; -#define HID_DLGFORM_SUB_CMDMOVEUP 34438 +// #define HID_DLGFORM_SUB_CMDMOVEUP 34438 hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVEUP; }; -#define HID_DLGFORM_SUB_CMDMOVEDOWN 34439 +// #define HID_DLGFORM_SUB_CMDMOVEDOWN 34439 hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVEDOWN; }; -#define HID_DLGFORM_LINKER_LSTSLAVELINK1 34441 +// #define HID_DLGFORM_LINKER_LSTSLAVELINK1 34441 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK1; }; -#define HID_DLGFORM_LINKER_LSTMASTERLINK1 34442 +// #define HID_DLGFORM_LINKER_LSTMASTERLINK1 34442 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK1; }; -#define HID_DLGFORM_LINKER_LSTSLAVELINK2 34443 +// #define HID_DLGFORM_LINKER_LSTSLAVELINK2 34443 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK2; }; -#define HID_DLGFORM_LINKER_LSTMASTERLINK2 34444 +// #define HID_DLGFORM_LINKER_LSTMASTERLINK2 34444 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK2; }; -#define HID_DLGFORM_LINKER_LSTSLAVELINK3 34445 +// #define HID_DLGFORM_LINKER_LSTSLAVELINK3 34445 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK3; }; -#define HID_DLGFORM_LINKER_LSTMASTERLINK3 34446 +// #define HID_DLGFORM_LINKER_LSTMASTERLINK3 34446 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK3; }; -#define HID_DLGFORM_LINKER_LSTSLAVELINK4 34447 +// #define HID_DLGFORM_LINKER_LSTSLAVELINK4 34447 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK4; }; -#define HID_DLGFORM_LINKER_LSTMASTERLINK4 34448 +// #define HID_DLGFORM_LINKER_LSTMASTERLINK4 34448 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK4; }; -#define HID_DLGFORM_CMDALIGNLEFT 34451 +// #define HID_DLGFORM_CMDALIGNLEFT 34451 hidspecial HID { HelpID = HID_DLGFORM_CMDALIGNLEFT; }; -#define HID_DLGFORM_CMDALIGNRIGHT 34452 +// #define HID_DLGFORM_CMDALIGNRIGHT 34452 hidspecial HID { HelpID = HID_DLGFORM_CMDALIGNRIGHT; }; -#define HID_DLGFORM_CMDLEFTLABELED 34453 +// #define HID_DLGFORM_CMDLEFTLABELED 34453 hidspecial HID { HelpID = HID_DLGFORM_CMDLEFTLABELED; }; -#define HID_DLGFORM_CMDTOPLABELED 34454 +// #define HID_DLGFORM_CMDTOPLABELED 34454 hidspecial HID { HelpID = HID_DLGFORM_CMDTOPLABELED; }; -#define HID_DLGFORM_CMDTABLESTYLE 34455 +// #define HID_DLGFORM_CMDTABLESTYLE 34455 hidspecial HID { HelpID = HID_DLGFORM_CMDTABLESTYLE; }; -#define HID_DLGFORM_CMDTOPJUSTIFIED 34456 +// #define HID_DLGFORM_CMDTOPJUSTIFIED 34456 hidspecial HID { HelpID = HID_DLGFORM_CMDTOPJUSTIFIED; }; -#define HID_DLGFORM_CMDLEFTLABELED2 34457 +// #define HID_DLGFORM_CMDLEFTLABELED2 34457 hidspecial HID { HelpID = HID_DLGFORM_CMDLEFTLABELED2; }; -#define HID_DLGFORM_CMDTOPLABELED2 34458 +// #define HID_DLGFORM_CMDTOPLABELED2 34458 hidspecial HID { HelpID = HID_DLGFORM_CMDTOPLABELED2; }; -#define HID_DLGFORM_CMDTABLESTYLE2 34459 +// #define HID_DLGFORM_CMDTABLESTYLE2 34459 hidspecial HID { HelpID = HID_DLGFORM_CMDTABLESTYLE2; }; -#define HID_DLGFORM_CMDTOPJUSTIFIED2 34460 +// #define HID_DLGFORM_CMDTOPJUSTIFIED2 34460 hidspecial HID { HelpID = HID_DLGFORM_CMDTOPJUSTIFIED2; }; -#define HID_DLGFORM_OPTNEWDATAONLY 34461 +// #define HID_DLGFORM_OPTNEWDATAONLY 34461 hidspecial HID { HelpID = HID_DLGFORM_OPTNEWDATAONLY; }; -#define HID_DLGFORM_OPTDISPLAYALLDATA 34462 +// #define HID_DLGFORM_OPTDISPLAYALLDATA 34462 hidspecial HID { HelpID = HID_DLGFORM_OPTDISPLAYALLDATA; }; -#define HID_DLGFORM_CHKNOMODIFICATION 34463 +// #define HID_DLGFORM_CHKNOMODIFICATION 34463 hidspecial HID { HelpID = HID_DLGFORM_CHKNOMODIFICATION; }; -#define HID_DLGFORM_CHKNODELETION 34464 +// #define HID_DLGFORM_CHKNODELETION 34464 hidspecial HID { HelpID = HID_DLGFORM_CHKNODELETION; }; -#define HID_DLGFORM_CHKNOADDITION 34465 +// #define HID_DLGFORM_CHKNOADDITION 34465 hidspecial HID { HelpID = HID_DLGFORM_CHKNOADDITION; }; -#define HID_DLGFORM_LSTSTYLES 34471 +// #define HID_DLGFORM_LSTSTYLES 34471 hidspecial HID { HelpID = HID_DLGFORM_LSTSTYLES; }; -#define HID_DLGFORM_CMDNOBORDER 34472 +// #define HID_DLGFORM_CMDNOBORDER 34472 hidspecial HID { HelpID = HID_DLGFORM_CMDNOBORDER; }; -#define HID_DLGFORM_CMD3DBORDER 34473 +// #define HID_DLGFORM_CMD3DBORDER 34473 hidspecial HID { HelpID = HID_DLGFORM_CMD3DBORDER; }; -#define HID_DLGFORM_CMDSIMPLEBORDER 34474 +// #define HID_DLGFORM_CMDSIMPLEBORDER 34474 hidspecial HID { HelpID = HID_DLGFORM_CMDSIMPLEBORDER; }; -#define HID_DLGFORM_TXTPATH 34481 +// #define HID_DLGFORM_TXTPATH 34481 hidspecial HID { HelpID = HID_DLGFORM_TXTPATH; }; -#define HID_DLGFORM_OPTWORKWITHFORM 34482 +// #define HID_DLGFORM_OPTWORKWITHFORM 34482 hidspecial HID { HelpID = HID_DLGFORM_OPTWORKWITHFORM; }; -#define HID_DLGFORM_OPTMODIFYFORM 34483 +// #define HID_DLGFORM_OPTMODIFYFORM 34483 hidspecial HID { HelpID = HID_DLGFORM_OPTMODIFYFORM; }; -#define HID_DLGNEWSLTR_DIALOG 34500 +// #define HID_DLGNEWSLTR_DIALOG 34500 hidspecial HID { HelpID = HID_DLGNEWSLTR_DIALOG; }; -#define HID_DLGNEWSLTR_OPTSTANDARDLAYOUT 34501 +// #define HID_DLGNEWSLTR_OPTSTANDARDLAYOUT 34501 hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTSTANDARDLAYOUT; }; -#define HID_DLGNEWSLTR_OPTPARTYLAYOUT 34502 +// #define HID_DLGNEWSLTR_OPTPARTYLAYOUT 34502 hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTPARTYLAYOUT; }; -#define HID_DLGNEWSLTR_OPTBROCHURELAYOUT 34503 +// #define HID_DLGNEWSLTR_OPTBROCHURELAYOUT 34503 hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTBROCHURELAYOUT; }; -#define HID_DLGNEWSLTR_OPTSINGLESIDED 34504 +// #define HID_DLGNEWSLTR_OPTSINGLESIDED 34504 hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTSINGLESIDED; }; -#define HID_DLGNEWSLTR_OPTDOUBLESIDED 34505 +// #define HID_DLGNEWSLTR_OPTDOUBLESIDED 34505 hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTDOUBLESIDED; }; -#define HID_DLGNEWSLTR_CMDGOON 34506 +// #define HID_DLGNEWSLTR_CMDGOON 34506 hidspecial HID { HelpID = HID_DLGNEWSLTR_CMDGOON; }; -#define HID_DLGDEPOT_DIALOG_SELLBUY 34520 +// #define HID_DLGDEPOT_DIALOG_SELLBUY 34520 hidspecial HID { HelpID = HID_DLGDEPOT_DIALOG_SELLBUY ; }; -#define HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY 34521 +// #define HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY 34521 hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY ; }; -#define HID_DLGDEPOT_0_TXTQUANTITY 34522 +// #define HID_DLGDEPOT_0_TXTQUANTITY 34522 hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTQUANTITY ; }; -#define HID_DLGDEPOT_0_TXTRATE 34523 +// #define HID_DLGDEPOT_0_TXTRATE 34523 hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTRATE ; }; -#define HID_DLGDEPOT_0_TXTDATE 34524 +// #define HID_DLGDEPOT_0_TXTDATE 34524 hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTDATE ; }; -#define HID_DLGDEPOT_0_TXTCOMMISSION 34525 +// #define HID_DLGDEPOT_0_TXTCOMMISSION 34525 hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTCOMMISSION ; }; -#define HID_DLGDEPOT_0_TXTFIX 34526 +// #define HID_DLGDEPOT_0_TXTFIX 34526 hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTFIX ; }; -#define HID_DLGDEPOT_0_TXTMINIMUM 34527 +// #define HID_DLGDEPOT_0_TXTMINIMUM 34527 hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTMINIMUM ; }; -#define HID_DLGDEPOT_0_CMDCANCEL_SELLBUY 34528 +// #define HID_DLGDEPOT_0_CMDCANCEL_SELLBUY 34528 hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDCANCEL_SELLBUY ; }; -#define HID_DLGDEPOT_0_CMDGOON_SELLBUY 34529 +// #define HID_DLGDEPOT_0_CMDGOON_SELLBUY 34529 hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDGOON_SELLBUY ; }; -#define HID_DLGDEPOT_1_LSTSELLSTOCKS 34530 +// #define HID_DLGDEPOT_1_LSTSELLSTOCKS 34530 hidspecial HID { HelpID = HID_DLGDEPOT_1_LSTSELLSTOCKS ; }; -#define HID_DLGDEPOT_2_LSTBUYSTOCKS 34531 +// #define HID_DLGDEPOT_2_LSTBUYSTOCKS 34531 hidspecial HID { HelpID = HID_DLGDEPOT_2_LSTBUYSTOCKS ; }; -#define HID_DLGDEPOT_DIALOG_SPLIT 34532 +// #define HID_DLGDEPOT_DIALOG_SPLIT 34532 hidspecial HID { HelpID = HID_DLGDEPOT_DIALOG_SPLIT ; }; -#define HID_DLGDEPOT_0_LSTSTOCKNAMES 34533 +// #define HID_DLGDEPOT_0_LSTSTOCKNAMES 34533 hidspecial HID { HelpID = HID_DLGDEPOT_0_LSTSTOCKNAMES ; }; -#define HID_DLGDEPOT_0_TXTSTOCKID_SPLIT 34534 +// #define HID_DLGDEPOT_0_TXTSTOCKID_SPLIT 34534 hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTSTOCKID_SPLIT ; }; -#define HID_DLGDEPOT_0_CMDCANCEL_SPLIT 34535 +// #define HID_DLGDEPOT_0_CMDCANCEL_SPLIT 34535 hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDCANCEL_SPLIT ; }; -#define HID_DLGDEPOT_0_CMDGOON_SPLIT 34536 +// #define HID_DLGDEPOT_0_CMDGOON_SPLIT 34536 hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDGOON_SPLIT ; }; -#define HID_DLGDEPOT_1_OPTPERSHARE 34537 +// #define HID_DLGDEPOT_1_OPTPERSHARE 34537 hidspecial HID { HelpID = HID_DLGDEPOT_1_OPTPERSHARE ; }; -#define HID_DLGDEPOT_1_OPTTOTAL 34538 +// #define HID_DLGDEPOT_1_OPTTOTAL 34538 hidspecial HID { HelpID = HID_DLGDEPOT_1_OPTTOTAL ; }; -#define HID_DLGDEPOT_1_TXTDIVIDEND 34539 +// #define HID_DLGDEPOT_1_TXTDIVIDEND 34539 hidspecial HID { HelpID = HID_DLGDEPOT_1_TXTDIVIDEND ; }; -#define HID_DLGDEPOT_2_TXTOLDRATE 34540 +// #define HID_DLGDEPOT_2_TXTOLDRATE 34540 hidspecial HID { HelpID = HID_DLGDEPOT_2_TXTOLDRATE ; }; -#define HID_DLGDEPOT_2_TXTNEWRATE 34541 +// #define HID_DLGDEPOT_2_TXTNEWRATE 34541 hidspecial HID { HelpID = HID_DLGDEPOT_2_TXTNEWRATE ; }; -#define HID_DLGDEPOT_2_TXTDATE 34542 +// #define HID_DLGDEPOT_2_TXTDATE 34542 hidspecial HID { HelpID = HID_DLGDEPOT_2_TXTDATE ; }; -#define HID_DLGDEPOT_3_TXTSTARTDATE 34543 +// #define HID_DLGDEPOT_3_TXTSTARTDATE 34543 hidspecial HID { HelpID = HID_DLGDEPOT_3_TXTSTARTDATE ; }; -#define HID_DLGDEPOT_3_TXTENDDATE 34544 +// #define HID_DLGDEPOT_3_TXTENDDATE 34544 hidspecial HID { HelpID = HID_DLGDEPOT_3_TXTENDDATE ; }; -#define HID_DLGDEPOT_3_OPTDAILY 34545 +// #define HID_DLGDEPOT_3_OPTDAILY 34545 hidspecial HID { HelpID = HID_DLGDEPOT_3_OPTDAILY ; }; -#define HID_DLGDEPOT_3_OPTWEEKLY 34546 +// #define HID_DLGDEPOT_3_OPTWEEKLY 34546 hidspecial HID { HelpID = HID_DLGDEPOT_3_OPTWEEKLY ; }; -#define HID_DLGDEPOT_DIALOG_HISTORY 34547 +// #define HID_DLGDEPOT_DIALOG_HISTORY 34547 hidspecial HID { HelpID = HID_DLGDEPOT_DIALOG_HISTORY ; }; -#define HID_DLGDEPOT_LSTMARKETS 34548 +// #define HID_DLGDEPOT_LSTMARKETS 34548 hidspecial HID { HelpID = HID_DLGDEPOT_LSTMARKETS ; }; -#define HID_DLGDEPOT_0_CMDCANCEL_HISTORY 34549 +// #define HID_DLGDEPOT_0_CMDCANCEL_HISTORY 34549 hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDCANCEL_HISTORY ; }; -#define HID_DLGDEPOT_0_CMDGOON_HISTORY 34550 +// #define HID_DLGDEPOT_0_CMDGOON_HISTORY 34550 hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDGOON_HISTORY ; }; -#define HID_DLGIMPORT_DIALOG 34570 +// #define HID_DLGIMPORT_DIALOG 34570 hidspecial HID { HelpID = HID_DLGIMPORT_DIALOG; }; -#define HID_DLGIMPORT_0_CMDHELP 34571 +// #define HID_DLGIMPORT_0_CMDHELP 34571 hidspecial HID { HelpID = HID_DLGIMPORT_0_CMDHELP; }; -#define HID_DLGIMPORT_0_CMDCANCEL 34572 +// #define HID_DLGIMPORT_0_CMDCANCEL 34572 hidspecial HID { HelpID = HID_DLGIMPORT_0_CMDCANCEL; }; -#define HID_DLGIMPORT_0_CMDPREV 34573 +// #define HID_DLGIMPORT_0_CMDPREV 34573 hidspecial HID { HelpID = HID_DLGIMPORT_0_CMDPREV; }; -#define HID_DLGIMPORT_0_CMDNEXT 34574 +// #define HID_DLGIMPORT_0_CMDNEXT 34574 hidspecial HID { HelpID = HID_DLGIMPORT_0_CMDNEXT; }; -#define HID_DLGIMPORT_0_OPTSODOCUMENTS 34575 +// #define HID_DLGIMPORT_0_OPTSODOCUMENTS 34575 hidspecial HID { HelpID = HID_DLGIMPORT_0_OPTSODOCUMENTS; }; -#define HID_DLGIMPORT_0_OPTMSDOCUMENTS 34576 +// #define HID_DLGIMPORT_0_OPTMSDOCUMENTS 34576 hidspecial HID { HelpID = HID_DLGIMPORT_0_OPTMSDOCUMENTS; }; -#define HID_DLGIMPORT_0_CHKLOGFILE 34577 +// #define HID_DLGIMPORT_0_CHKLOGFILE 34577 hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKLOGFILE; }; -#define HID_DLGIMPORT_2_CHKWORD 34578 +// #define HID_DLGIMPORT_2_CHKWORD 34578 hidspecial HID { HelpID = HID_DLGIMPORT_2_CHKWORD; }; -#define HID_DLGIMPORT_2_CHKEXCEL 34579 +// #define HID_DLGIMPORT_2_CHKEXCEL 34579 hidspecial HID { HelpID = HID_DLGIMPORT_2_CHKEXCEL; }; -#define HID_DLGIMPORT_2_CHKPOWERPOINT 34580 +// #define HID_DLGIMPORT_2_CHKPOWERPOINT 34580 hidspecial HID { HelpID = HID_DLGIMPORT_2_CHKPOWERPOINT; }; -#define HID_DLGIMPORT_2_CBTEMPLATE 34581 +// #define HID_DLGIMPORT_2_CBTEMPLATE 34581 hidspecial HID { HelpID = HID_DLGIMPORT_2_CBTEMPLATE; }; -#define HID_DLGIMPORT_2_CBTEMPLATERECURSE 34582 +// #define HID_DLGIMPORT_2_CBTEMPLATERECURSE 34582 hidspecial HID { HelpID = HID_DLGIMPORT_2_CBTEMPLATERECURSE; }; -#define HID_DLGIMPORT_2_LBTEMPLATEPATH 34583 +// #define HID_DLGIMPORT_2_LBTEMPLATEPATH 34583 hidspecial HID { HelpID = HID_DLGIMPORT_2_LBTEMPLATEPATH; }; -#define HID_DLGIMPORT_2_EDTEMPLATEPATH 34584 +// #define HID_DLGIMPORT_2_EDTEMPLATEPATH 34584 hidspecial HID { HelpID = HID_DLGIMPORT_2_EDTEMPLATEPATH; }; -#define HID_DLGIMPORT_2_CBDOCUMENT 34586 +// #define HID_DLGIMPORT_2_CBDOCUMENT 34586 hidspecial HID { HelpID = HID_DLGIMPORT_2_CBDOCUMENT; }; -#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT 34585 +// #define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT 34585 hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT; }; -#define HID_DLGIMPORT_2_CBDOCUMENT 34586 +// #define HID_DLGIMPORT_2_CBDOCUMENT 34586 hidspecial HID { HelpID = HID_DLGIMPORT_2_CBDOCUMENT; }; -#define HID_DLGIMPORT_2_CBDOCUMENTRECURSE 34587 +// #define HID_DLGIMPORT_2_CBDOCUMENTRECURSE 34587 hidspecial HID { HelpID = HID_DLGIMPORT_2_CBDOCUMENTRECURSE; }; -#define HID_DLGIMPORT_2_LBDOCUMENTPATH 34588 +// #define HID_DLGIMPORT_2_LBDOCUMENTPATH 34588 hidspecial HID { HelpID = HID_DLGIMPORT_2_LBDOCUMENTPATH; }; -#define HID_DLGIMPORT_2_EDDOCUMENTPATH 34589 +// #define HID_DLGIMPORT_2_EDDOCUMENTPATH 34589 hidspecial HID { HelpID = HID_DLGIMPORT_2_EDDOCUMENTPATH; }; -#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT 34590 +// #define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT 34590 hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT; }; -#define HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH 34591 +// #define HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH 34591 hidspecial HID { HelpID = HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH; }; -#define HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH 34592 +// #define HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH 34592 hidspecial HID { HelpID = HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH; }; -#define HID_DLGIMPORT_2_CMDEXPORTPATHSELECT 34593 +// #define HID_DLGIMPORT_2_CMDEXPORTPATHSELECT 34593 hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDEXPORTPATHSELECT; }; -#define HID_DLGIMPORT_3_TBSUMMARY 34595 +// #define HID_DLGIMPORT_3_TBSUMMARY 34595 hidspecial HID { HelpID = HID_DLGIMPORT_3_TBSUMMARY; }; -#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2 34600 +// #define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2 34600 hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2; }; -#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2 34601 +// #define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2 34601 hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2; }; -#define HID_DLGIMPORT_0_CHKWRITER 34596 +// #define HID_DLGIMPORT_0_CHKWRITER 34596 hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKWRITER; }; -#define HID_DLGIMPORT_0_CHKCALC 34597 +// #define HID_DLGIMPORT_0_CHKCALC 34597 hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKCALC; }; -#define HID_DLGIMPORT_0_CHKIMPRESS 34598 +// #define HID_DLGIMPORT_0_CHKIMPRESS 34598 hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKIMPRESS; }; -#define HID_DLGIMPORT_0_CHKMATHGLOBAL 34599 +// #define HID_DLGIMPORT_0_CHKMATHGLOBAL 34599 hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKMATHGLOBAL; }; -#define HID_DLGCORRESPONDENCE_DIALOG 34630 +// #define HID_DLGCORRESPONDENCE_DIALOG 34630 hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_DIALOG; }; -#define HID_DLGCORRESPONDENCE_CANCEL 34631 +// #define HID_DLGCORRESPONDENCE_CANCEL 34631 hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_CANCEL; }; -#define HID_DLGCORRESPONDENCE_OPTIONAGENDA1 34632 +// #define HID_DLGCORRESPONDENCE_OPTIONAGENDA1 34632 hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_OPTIONAGENDA1; }; -#define HID_DLGCORRESPONDENCE_OPTIONAGENDA2 34633 +// #define HID_DLGCORRESPONDENCE_OPTIONAGENDA2 34633 hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_OPTIONAGENDA2; }; -#define HID_DLGCORRESPONDENCE_AGENDAOKAY 34634 +// #define HID_DLGCORRESPONDENCE_AGENDAOKAY 34634 hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_AGENDAOKAY; }; -#define HID_DLGCORRESPONDENCE_OPTIONLETTER1 34635 +// #define HID_DLGCORRESPONDENCE_OPTIONLETTER1 34635 hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_OPTIONLETTER1; }; -#define HID_DLGCORRESPONDENCE_OPTIONLETTER2 34636 +// #define HID_DLGCORRESPONDENCE_OPTIONLETTER2 34636 hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_OPTIONLETTER2; }; -#define HID_DLGCORRESPONDENCE_LETTEROKAY 34637 +// #define HID_DLGCORRESPONDENCE_LETTEROKAY 34637 hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_LETTEROKAY; }; -#define HID_DLGSTYLES_DIALOG 34650 +// #define HID_DLGSTYLES_DIALOG 34650 hidspecial HID { HelpID = HID_DLGSTYLES_DIALOG; }; -#define HID_DLGSTYLES_LISTBOX 34651 +// #define HID_DLGSTYLES_LISTBOX 34651 hidspecial HID { HelpID = HID_DLGSTYLES_LISTBOX; }; -#define HID_DLGSTYLES_CANCEL 34652 +// #define HID_DLGSTYLES_CANCEL 34652 hidspecial HID { HelpID = HID_DLGSTYLES_CANCEL; }; -#define HID_DLGSTYLES_OKAY 34653 +// #define HID_DLGSTYLES_OKAY 34653 hidspecial HID { HelpID = HID_DLGSTYLES_OKAY; }; -#define HID_DLGCONVERT_DIALOG 34660 +// #define HID_DLGCONVERT_DIALOG 34660 hidspecial HID { HelpID = HID_DLGCONVERT_DIALOG; }; -#define HID_DLGCONVERT_CHECKBOX1 34661 +// #define HID_DLGCONVERT_CHECKBOX1 34661 hidspecial HID { HelpID = HID_DLGCONVERT_CHECKBOX1; }; -#define HID_DLGCONVERT_OPTIONBUTTON1 34662 +// #define HID_DLGCONVERT_OPTIONBUTTON1 34662 hidspecial HID { HelpID = HID_DLGCONVERT_OPTIONBUTTON1; }; -#define HID_DLGCONVERT_OPTIONBUTTON2 34663 +// #define HID_DLGCONVERT_OPTIONBUTTON2 34663 hidspecial HID { HelpID = HID_DLGCONVERT_OPTIONBUTTON2; }; -#define HID_DLGCONVERT_OPTIONBUTTON3 34664 +// #define HID_DLGCONVERT_OPTIONBUTTON3 34664 hidspecial HID { HelpID = HID_DLGCONVERT_OPTIONBUTTON3; }; -#define HID_DLGCONVERT_OPTIONBUTTON4 34665 +// #define HID_DLGCONVERT_OPTIONBUTTON4 34665 hidspecial HID { HelpID = HID_DLGCONVERT_OPTIONBUTTON4; }; -#define HID_DLGCONVERT_LISTBOX1 34666 +// #define HID_DLGCONVERT_LISTBOX1 34666 hidspecial HID { HelpID = HID_DLGCONVERT_LISTBOX1; }; -#define HID_DLGCONVERT_OBFILE 34667 +// #define HID_DLGCONVERT_OBFILE 34667 hidspecial HID { HelpID = HID_DLGCONVERT_OBFILE; }; -#define HID_DLGCONVERT_OBDIR 34668 +// #define HID_DLGCONVERT_OBDIR 34668 hidspecial HID { HelpID = HID_DLGCONVERT_OBDIR; }; -#define HID_DLGCONVERT_COMBOBOX1 34669 +// #define HID_DLGCONVERT_COMBOBOX1 34669 hidspecial HID { HelpID = HID_DLGCONVERT_COMBOBOX1; }; -#define HID_DLGCONVERT_TBSOURCE 34670 +// #define HID_DLGCONVERT_TBSOURCE 34670 hidspecial HID { HelpID = HID_DLGCONVERT_TBSOURCE; }; -#define HID_DLGCONVERT_CHECKRECURSIVE 34671 +// #define HID_DLGCONVERT_CHECKRECURSIVE 34671 hidspecial HID { HelpID = HID_DLGCONVERT_CHECKRECURSIVE; }; -#define HID_DLGCONVERT_TBTARGET 34672 +// #define HID_DLGCONVERT_TBTARGET 34672 hidspecial HID { HelpID = HID_DLGCONVERT_TBTARGET; }; -#define HID_DLGCONVERT_CBCANCEL 34673 +// #define HID_DLGCONVERT_CBCANCEL 34673 hidspecial HID { HelpID = HID_DLGCONVERT_CBCANCEL; }; -#define HID_DLGCONVERT_CBHELP 34674 +// #define HID_DLGCONVERT_CBHELP 34674 hidspecial HID { HelpID = HID_DLGCONVERT_CBHELP; }; -#define HID_DLGCONVERT_CBBACK 34675 +// #define HID_DLGCONVERT_CBBACK 34675 hidspecial HID { HelpID = HID_DLGCONVERT_CBBACK; }; -#define HID_DLGCONVERT_CBGOON 34676 +// #define HID_DLGCONVERT_CBGOON 34676 hidspecial HID { HelpID = HID_DLGCONVERT_CBGOON; }; -#define HID_DLGCONVERT_CBSOURCEOPEN 34677 +// #define HID_DLGCONVERT_CBSOURCEOPEN 34677 hidspecial HID { HelpID = HID_DLGCONVERT_CBSOURCEOPEN; }; -#define HID_DLGCONVERT_CBTARGETOPEN 34678 +// #define HID_DLGCONVERT_CBTARGETOPEN 34678 hidspecial HID { HelpID = HID_DLGCONVERT_CBTARGETOPEN; }; -#define HID_DLGCONVERT_CHKPROTECT 34679 +// #define HID_DLGCONVERT_CHKPROTECT 34679 hidspecial HID { HelpID = HID_DLGCONVERT_CHKPROTECT; }; -#define HID_DLGCONVERT_CHKTEXTDOCUMENTS 34680 +// #define HID_DLGCONVERT_CHKTEXTDOCUMENTS 34680 hidspecial HID { HelpID = HID_DLGCONVERT_CHKTEXTDOCUMENTS; }; -#define HID_DLGPASSWORD_CMDGOON 34690 +// #define HID_DLGPASSWORD_CMDGOON 34690 hidspecial HID { HelpID = HID_DLGPASSWORD_CMDGOON; }; -#define HID_DLGPASSWORD_CMDCANCEL 34691 +// #define HID_DLGPASSWORD_CMDCANCEL 34691 hidspecial HID { HelpID = HID_DLGPASSWORD_CMDCANCEL; }; -#define HID_DLGPASSWORD_CMDHELP 34692 +// #define HID_DLGPASSWORD_CMDHELP 34692 hidspecial HID { HelpID = HID_DLGPASSWORD_CMDHELP; }; -#define HID_DLGPASSWORD_TXTPASSWORD 34693 +// #define HID_DLGPASSWORD_TXTPASSWORD 34693 hidspecial HID { HelpID = HID_DLGPASSWORD_TXTPASSWORD; }; -#define HID_DLGHOLIDAYCAL_DIALOG 34700 +// #define HID_DLGHOLIDAYCAL_DIALOG 34700 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_DIALOG; }; -#define HID_DLGHOLIDAYCAL_1_PREVIEW 34701 +// #define HID_DLGHOLIDAYCAL_1_PREVIEW 34701 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_PREVIEW; }; -#define HID_DLGHOLIDAYCAL_1_OPYEAR 34702 +// #define HID_DLGHOLIDAYCAL_1_OPYEAR 34702 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_OPYEAR; }; -#define HID_DLGHOLIDAYCAL_1_OPMONTH 34703 +// #define HID_DLGHOLIDAYCAL_1_OPMONTH 34703 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_OPMONTH; }; -#define HID_DLGHOLIDAYCAL_1_EDYEAR 34704 +// #define HID_DLGHOLIDAYCAL_1_EDYEAR 34704 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_EDYEAR; }; -#define HID_DLGHOLIDAYCAL_1_EDMONTH 34705 +// #define HID_DLGHOLIDAYCAL_1_EDMONTH 34705 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_EDMONTH; }; -#define HID_DLGHOLIDAYCAL_1_SPINYEAR 34706 +// #define HID_DLGHOLIDAYCAL_1_SPINYEAR 34706 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_SPINYEAR; }; -#define HID_DLGHOLIDAYCAL_1_SPINMONTH 34707 +// #define HID_DLGHOLIDAYCAL_1_SPINMONTH 34707 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_SPINMONTH; }; -#define HID_DLGHOLIDAYCAL_1_CMBSTATE 34708 +// #define HID_DLGHOLIDAYCAL_1_CMBSTATE 34708 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_CMBSTATE; }; -#define HID_DLGHOLIDAYCAL_2_LBOWNDATA 34709 +// #define HID_DLGHOLIDAYCAL_2_LBOWNDATA 34709 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_LBOWNDATA; }; -#define HID_DLGHOLIDAYCAL_2_CMDINSERT 34710 +// #define HID_DLGHOLIDAYCAL_2_CMDINSERT 34710 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_CMDINSERT; }; -#define HID_DLGHOLIDAYCAL_2_CMDDELETE 34711 +// #define HID_DLGHOLIDAYCAL_2_CMDDELETE 34711 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_CMDDELETE; }; -#define HID_DLGHOLIDAYCAL_2_EDEVENT 34712 +// #define HID_DLGHOLIDAYCAL_2_EDEVENT 34712 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_EDEVENT; }; -#define HID_DLGHOLIDAYCAL_2_CHKEVENT 34713 +// #define HID_DLGHOLIDAYCAL_2_CHKEVENT 34713 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_CHKEVENT; }; -#define HID_DLGHOLIDAYCAL_2_EDEVENTDAY 34714 +// #define HID_DLGHOLIDAYCAL_2_EDEVENTDAY 34714 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_EDEVENTDAY; }; -#define HID_DLGHOLIDAYCAL_2_SPINEVENTDAY 34715 +// #define HID_DLGHOLIDAYCAL_2_SPINEVENTDAY 34715 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_SPINEVENTDAY; }; -#define HID_DLGHOLIDAYCAL_2_EDEVENTMONTH 34716 +// #define HID_DLGHOLIDAYCAL_2_EDEVENTMONTH 34716 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_EDEVENTMONTH; }; -#define HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH 34717 +// #define HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH 34717 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH; }; -#define HID_DLGHOLIDAYCAL_2_EDEVENTYEAR 34718 +// #define HID_DLGHOLIDAYCAL_2_EDEVENTYEAR 34718 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_EDEVENTYEAR; }; -#define HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR 34719 +// #define HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR 34719 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR; }; -#define HID_DLGHOLIDAYCAL_0_CMDOWNDATA 34720 +// #define HID_DLGHOLIDAYCAL_0_CMDOWNDATA 34720 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_0_CMDOWNDATA; }; -#define HID_DLGHOLIDAYCAL_0_CMDCANCEL 34721 +// #define HID_DLGHOLIDAYCAL_0_CMDCANCEL 34721 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_0_CMDCANCEL; }; -#define HID_DLGHOLIDAYCAL_0_CMDOK 34722 +// #define HID_DLGHOLIDAYCAL_0_CMDOK 34722 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_0_CMDOK; }; //End at 34767 @@ -785,381 +786,381 @@ hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_0_CMDOK; }; //LetterWizard--------------------------- -#define HID_LTRWIZ_OPTBUSINESSLETTER 40769 +// #define HID_LTRWIZ_OPTBUSINESSLETTER 40769 hidspecial HID { HelpID = HID_LTRWIZ_OPTBUSINESSLETTER; }; -#define HID_LTRWIZ_OPTPRIVOFFICIALLETTER 40770 +// #define HID_LTRWIZ_OPTPRIVOFFICIALLETTER 40770 hidspecial HID { HelpID = HID_LTRWIZ_OPTPRIVOFFICIALLETTER; }; -#define HID_LTRWIZ_OPTPRIVATELETTER 40771 +// #define HID_LTRWIZ_OPTPRIVATELETTER 40771 hidspecial HID { HelpID = HID_LTRWIZ_OPTPRIVATELETTER; }; -#define HID_LTRWIZ_LSTBUSINESSSTYLE 40772 +// #define HID_LTRWIZ_LSTBUSINESSSTYLE 40772 hidspecial HID { HelpID = HID_LTRWIZ_LSTBUSINESSSTYLE; }; -#define HID_LTRWIZ_CHKBUSINESSPAPER 40773 +// #define HID_LTRWIZ_CHKBUSINESSPAPER 40773 hidspecial HID { HelpID = HID_LTRWIZ_CHKBUSINESSPAPER; }; -#define HID_LTRWIZ_LSTPRIVOFFICIALSTYLE 40774 +// #define HID_LTRWIZ_LSTPRIVOFFICIALSTYLE 40774 hidspecial HID { HelpID = HID_LTRWIZ_LSTPRIVOFFICIALSTYLE; }; -#define HID_LTRWIZ_LSTPRIVATESTYLE 40775 +// #define HID_LTRWIZ_LSTPRIVATESTYLE 40775 hidspecial HID { HelpID = HID_LTRWIZ_LSTPRIVATESTYLE; }; -#define HID_LTRWIZ_CHKPAPERCOMPANYLOGO 40776 +// #define HID_LTRWIZ_CHKPAPERCOMPANYLOGO 40776 hidspecial HID { HelpID = HID_LTRWIZ_CHKPAPERCOMPANYLOGO; }; -#define HID_LTRWIZ_NUMLOGOHEIGHT 40777 +// #define HID_LTRWIZ_NUMLOGOHEIGHT 40777 hidspecial HID { HelpID = HID_LTRWIZ_NUMLOGOHEIGHT; }; -#define HID_LTRWIZ_NUMLOGOX 40778 +// #define HID_LTRWIZ_NUMLOGOX 40778 hidspecial HID { HelpID = HID_LTRWIZ_NUMLOGOX; }; -#define HID_LTRWIZ_NUMLOGOWIDTH 40779 +// #define HID_LTRWIZ_NUMLOGOWIDTH 40779 hidspecial HID { HelpID = HID_LTRWIZ_NUMLOGOWIDTH; }; -#define HID_LTRWIZ_NUMLOGOY 40780 +// #define HID_LTRWIZ_NUMLOGOY 40780 hidspecial HID { HelpID = HID_LTRWIZ_NUMLOGOY; }; -#define HID_LTRWIZ_CHKPAPERCOMPANYADDRESS 40781 +// #define HID_LTRWIZ_CHKPAPERCOMPANYADDRESS 40781 hidspecial HID { HelpID = HID_LTRWIZ_CHKPAPERCOMPANYADDRESS; }; -#define HID_LTRWIZ_NUMADDRESSHEIGHT 40782 +// #define HID_LTRWIZ_NUMADDRESSHEIGHT 40782 hidspecial HID { HelpID = HID_LTRWIZ_NUMADDRESSHEIGHT; }; -#define HID_LTRWIZ_NUMADDRESSX 40783 +// #define HID_LTRWIZ_NUMADDRESSX 40783 hidspecial HID { HelpID = HID_LTRWIZ_NUMADDRESSX; }; -#define HID_LTRWIZ_NUMADDRESSWIDTH 40784 +// #define HID_LTRWIZ_NUMADDRESSWIDTH 40784 hidspecial HID { HelpID = HID_LTRWIZ_NUMADDRESSWIDTH; }; -#define HID_LTRWIZ_NUMADDRESSY 40785 +// #define HID_LTRWIZ_NUMADDRESSY 40785 hidspecial HID { HelpID = HID_LTRWIZ_NUMADDRESSY; }; -#define HID_LTRWIZ_CHKCOMPANYRECEIVER 40786 +// #define HID_LTRWIZ_CHKCOMPANYRECEIVER 40786 hidspecial HID { HelpID = HID_LTRWIZ_CHKCOMPANYRECEIVER; }; -#define HID_LTRWIZ_CHKPAPERFOOTER 40787 +// #define HID_LTRWIZ_CHKPAPERFOOTER 40787 hidspecial HID { HelpID = HID_LTRWIZ_CHKPAPERFOOTER; }; -#define HID_LTRWIZ_NUMFOOTERHEIGHT 40788 +// #define HID_LTRWIZ_NUMFOOTERHEIGHT 40788 hidspecial HID { HelpID = HID_LTRWIZ_NUMFOOTERHEIGHT; }; -#define HID_LTRWIZ_LSTLETTERNORM 40789 +// #define HID_LTRWIZ_LSTLETTERNORM 40789 hidspecial HID { HelpID = HID_LTRWIZ_LSTLETTERNORM; }; -#define HID_LTRWIZ_CHKUSELOGO 40790 +// #define HID_LTRWIZ_CHKUSELOGO 40790 hidspecial HID { HelpID = HID_LTRWIZ_CHKUSELOGO; }; -#define HID_LTRWIZ_CHKUSEADDRESSRECEIVER 40791 +// #define HID_LTRWIZ_CHKUSEADDRESSRECEIVER 40791 hidspecial HID { HelpID = HID_LTRWIZ_CHKUSEADDRESSRECEIVER; }; -#define HID_LTRWIZ_CHKUSESIGNS 40792 +// #define HID_LTRWIZ_CHKUSESIGNS 40792 hidspecial HID { HelpID = HID_LTRWIZ_CHKUSESIGNS; }; -#define HID_LTRWIZ_CHKUSESUBJECT 40793 +// #define HID_LTRWIZ_CHKUSESUBJECT 40793 hidspecial HID { HelpID = HID_LTRWIZ_CHKUSESUBJECT; }; -#define HID_LTRWIZ_CHKUSESALUTATION 40794 +// #define HID_LTRWIZ_CHKUSESALUTATION 40794 hidspecial HID { HelpID = HID_LTRWIZ_CHKUSESALUTATION; }; -#define HID_LTRWIZ_LSTSALUTATION 40795 +// #define HID_LTRWIZ_LSTSALUTATION 40795 hidspecial HID { HelpID = HID_LTRWIZ_LSTSALUTATION; }; -#define HID_LTRWIZ_CHKUSEBENDMARKS 40796 +// #define HID_LTRWIZ_CHKUSEBENDMARKS 40796 hidspecial HID { HelpID = HID_LTRWIZ_CHKUSEBENDMARKS; }; -#define HID_LTRWIZ_CHKUSEGREETING 40797 +// #define HID_LTRWIZ_CHKUSEGREETING 40797 hidspecial HID { HelpID = HID_LTRWIZ_CHKUSEGREETING; }; -#define HID_LTRWIZ_LSTGREETING 40798 +// #define HID_LTRWIZ_LSTGREETING 40798 hidspecial HID { HelpID = HID_LTRWIZ_LSTGREETING; }; -#define HID_LTRWIZ_CHKUSEFOOTER 40799 +// #define HID_LTRWIZ_CHKUSEFOOTER 40799 hidspecial HID { HelpID = HID_LTRWIZ_CHKUSEFOOTER; }; -#define HID_LTRWIZ_OPTSENDERPLACEHOLDER 40800 +// #define HID_LTRWIZ_OPTSENDERPLACEHOLDER 40800 hidspecial HID { HelpID = HID_LTRWIZ_OPTSENDERPLACEHOLDER; }; -#define HID_LTRWIZ_OPTSENDERDEFINE 40801 +// #define HID_LTRWIZ_OPTSENDERDEFINE 40801 hidspecial HID { HelpID = HID_LTRWIZ_OPTSENDERDEFINE; }; -#define HID_LTRWIZ_TXTSENDERNAME 40802 +// #define HID_LTRWIZ_TXTSENDERNAME 40802 hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERNAME; }; -#define HID_LTRWIZ_TXTSENDERSTREET 40803 +// #define HID_LTRWIZ_TXTSENDERSTREET 40803 hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERSTREET; }; -#define HID_LTRWIZ_TXTSENDERPOSTCODE 40804 +// #define HID_LTRWIZ_TXTSENDERPOSTCODE 40804 hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERPOSTCODE; }; -#define HID_LTRWIZ_TXTSENDERSTATE_TEXT 40805 +// #define HID_LTRWIZ_TXTSENDERSTATE_TEXT 40805 hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERSTATE_TEXT; }; -#define HID_LTRWIZ_TXTSENDERCITY 40806 +// #define HID_LTRWIZ_TXTSENDERCITY 40806 hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERCITY; }; -#define HID_LTRWIZ_OPTRECEIVERPLACEHOLDER 40807 +// #define HID_LTRWIZ_OPTRECEIVERPLACEHOLDER 40807 hidspecial HID { HelpID = HID_LTRWIZ_OPTRECEIVERPLACEHOLDER; }; -#define HID_LTRWIZ_OPTRECEIVERDATABASE 40808 +// #define HID_LTRWIZ_OPTRECEIVERDATABASE 40808 hidspecial HID { HelpID = HID_LTRWIZ_OPTRECEIVERDATABASE; }; -#define HID_LTRWIZ_TXTFOOTER 40809 +// #define HID_LTRWIZ_TXTFOOTER 40809 hidspecial HID { HelpID = HID_LTRWIZ_TXTFOOTER; }; -#define HID_LTRWIZ_CHKFOOTERNEXTPAGES 40810 +// #define HID_LTRWIZ_CHKFOOTERNEXTPAGES 40810 hidspecial HID { HelpID = HID_LTRWIZ_CHKFOOTERNEXTPAGES; }; -#define HID_LTRWIZ_CHKFOOTERPAGENUMBERS 40811 +// #define HID_LTRWIZ_CHKFOOTERPAGENUMBERS 40811 hidspecial HID { HelpID = HID_LTRWIZ_CHKFOOTERPAGENUMBERS; }; -#define HID_LTRWIZ_TXTTEMPLATENAME 40812 +// #define HID_LTRWIZ_TXTTEMPLATENAME 40812 hidspecial HID { HelpID = HID_LTRWIZ_TXTTEMPLATENAME; }; -#define HID_LTRWIZ_OPTCREATELETTER 40813 +// #define HID_LTRWIZ_OPTCREATELETTER 40813 hidspecial HID { HelpID = HID_LTRWIZ_OPTCREATELETTER; }; -#define HID_LTRWIZ_OPTMAKECHANGES 40814 +// #define HID_LTRWIZ_OPTMAKECHANGES 40814 hidspecial HID { HelpID = HID_LTRWIZ_OPTMAKECHANGES; }; -#define HID_LTRWIZ_TXTPATH 40815 +// #define HID_LTRWIZ_TXTPATH 40815 hidspecial HID { HelpID = HID_LTRWIZ_TXTPATH; }; -#define HID_LTRWIZ_CMDPATH 40816 +// #define HID_LTRWIZ_CMDPATH 40816 hidspecial HID { HelpID = HID_LTRWIZ_CMDPATH; }; -#define HID_LTRWIZARD 40820 +// #define HID_LTRWIZARD 40820 hidspecial HID { HelpID = HID_LTRWIZARD; }; -#define HID_LTRWIZARD_HELP 40821 +// #define HID_LTRWIZARD_HELP 40821 hidspecial HID { HelpID = HID_LTRWIZARD_HELP; }; -#define HID_LTRWIZARD_BACK 40822 +// #define HID_LTRWIZARD_BACK 40822 hidspecial HID { HelpID = HID_LTRWIZARD_BACK; }; -#define HID_LTRWIZARD_NEXT 40823 +// #define HID_LTRWIZARD_NEXT 40823 hidspecial HID { HelpID = HID_LTRWIZARD_NEXT; }; -#define HID_LTRWIZARD_CREATE 40824 +// #define HID_LTRWIZARD_CREATE 40824 hidspecial HID { HelpID = HID_LTRWIZARD_CREATE; }; -#define HID_LTRWIZARD_CANCEL 40825 +// #define HID_LTRWIZARD_CANCEL 40825 hidspecial HID { HelpID = HID_LTRWIZARD_CANCEL; }; -#define HID_QUERYWIZARD_LSTTABLES 40850 +// #define HID_QUERYWIZARD_LSTTABLES 40850 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTTABLES; }; -#define HID_QUERYWIZARD_LSTFIELDS 40851 +// #define HID_QUERYWIZARD_LSTFIELDS 40851 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDS; }; -#define HID_QUERYWIZARD_CMDMOVESELECTED 40852 +// #define HID_QUERYWIZARD_CMDMOVESELECTED 40852 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVESELECTED; }; -#define HID_QUERYWIZARD_CMDMOVEALL 40853 +// #define HID_QUERYWIZARD_CMDMOVEALL 40853 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVEALL; }; -#define HID_QUERYWIZARD_CMDREMOVESELECTED 40854 +// #define HID_QUERYWIZARD_CMDREMOVESELECTED 40854 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDREMOVESELECTED; }; -#define HID_QUERYWIZARD_CMDREMOVEALL 40855 +// #define HID_QUERYWIZARD_CMDREMOVEALL 40855 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDREMOVEALL; }; -#define HID_QUERYWIZARD_LSTSELFIELDS 40856 +// #define HID_QUERYWIZARD_LSTSELFIELDS 40856 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTSELFIELDS; }; -#define HID_QUERYWIZARD_CMDMOVEUP 40857 +// #define HID_QUERYWIZARD_CMDMOVEUP 40857 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVEUP; }; -#define HID_QUERYWIZARD_CMDMOVEDOWN 40858 +// #define HID_QUERYWIZARD_CMDMOVEDOWN 40858 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVEDOWN; }; -#define HID_QUERYWIZARD_SORT1 40865 +// #define HID_QUERYWIZARD_SORT1 40865 hidspecial HID { HelpID = HID_QUERYWIZARD_SORT1; }; -#define HID_QUERYWIZARD_OPTASCEND1 40866 +// #define HID_QUERYWIZARD_OPTASCEND1 40866 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND1; }; -#define HID_QUERYWIZARD_OPTDESCEND1 40867 +// #define HID_QUERYWIZARD_OPTDESCEND1 40867 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND1; }; -#define HID_QUERYWIZARD_SORT2 40868 +// #define HID_QUERYWIZARD_SORT2 40868 hidspecial HID { HelpID = HID_QUERYWIZARD_SORT2; }; -#define HID_QUERYWIZARD_OPTASCEND2 40869 +// #define HID_QUERYWIZARD_OPTASCEND2 40869 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND2; }; -#define HID_QUERYWIZARD_OPTDESCEND2 40870 +// #define HID_QUERYWIZARD_OPTDESCEND2 40870 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND2; }; -#define HID_QUERYWIZARD_SORT3 40871 +// #define HID_QUERYWIZARD_SORT3 40871 hidspecial HID { HelpID = HID_QUERYWIZARD_SORT3; }; -#define HID_QUERYWIZARD_OPTASCEND3 40872 +// #define HID_QUERYWIZARD_OPTASCEND3 40872 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND3; }; -#define HID_QUERYWIZARD_OPTDESCEND3 40873 +// #define HID_QUERYWIZARD_OPTDESCEND3 40873 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND3; }; -#define HID_QUERYWIZARD_SORT4 40874 +// #define HID_QUERYWIZARD_SORT4 40874 hidspecial HID { HelpID = HID_QUERYWIZARD_SORT4; }; -#define HID_QUERYWIZARD_OPTASCEND4 40875 +// #define HID_QUERYWIZARD_OPTASCEND4 40875 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND4; }; -#define HID_QUERYWIZARD_OPTDESCEND4 40876 +// #define HID_QUERYWIZARD_OPTDESCEND4 40876 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND4; }; -#define HID_QUERYWIZARD_OPTMATCHALL 40878 +// #define HID_QUERYWIZARD_OPTMATCHALL 40878 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTMATCHALL; }; -#define HID_QUERYWIZARD_OPTMATCHANY 40879 +// #define HID_QUERYWIZARD_OPTMATCHANY 40879 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTMATCHANY; }; -#define HID_QUERYWIZARD_LSTFIELDNAME_1 40880 +// #define HID_QUERYWIZARD_LSTFIELDNAME_1 40880 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDNAME_1; }; -#define HID_QUERYWIZARD_LSTOPERATOR_1 40881 +// #define HID_QUERYWIZARD_LSTOPERATOR_1 40881 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTOPERATOR_1; }; -#define HID_QUERYWIZARD_TXTVALUE_1 40882 +// #define HID_QUERYWIZARD_TXTVALUE_1 40882 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTVALUE_1; }; -#define HID_QUERYWIZARD_LSTFIELDNAME_2 40883 +// #define HID_QUERYWIZARD_LSTFIELDNAME_2 40883 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDNAME_2; }; -#define HID_QUERYWIZARD_LSTOPERATOR_2 40884 +// #define HID_QUERYWIZARD_LSTOPERATOR_2 40884 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTOPERATOR_2; }; -#define HID_QUERYWIZARD_TXTVALUE_2 40885 +// #define HID_QUERYWIZARD_TXTVALUE_2 40885 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTVALUE_2; }; -#define HID_QUERYWIZARD_LSTFIELDNAME_3 40886 +// #define HID_QUERYWIZARD_LSTFIELDNAME_3 40886 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDNAME_3; }; -#define HID_QUERYWIZARD_LSTOPERATOR_3 40887 +// #define HID_QUERYWIZARD_LSTOPERATOR_3 40887 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTOPERATOR_3; }; -#define HID_QUERYWIZARD_TXTVALUE_3 40888 +// #define HID_QUERYWIZARD_TXTVALUE_3 40888 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTVALUE_3; }; -#define HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY 40895 +// #define HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY 40895 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY; }; -#define HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY 40896 +// #define HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY 40896 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1 40897 +// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1 40897 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1 40898 +// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1 40898 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2 40899 +// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2 40899 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2 40900 +// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2 40900 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3 40901 +// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3 40901 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3 40902 +// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3 40902 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4 40903 +// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4 40903 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4 40904 +// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4 40904 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5 40905 +// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5 40905 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5 40906 +// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5 40906 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5; }; -#define HID_QUERYWIZARD_BTNAGGREGATEPLUS 40907 +// #define HID_QUERYWIZARD_BTNAGGREGATEPLUS 40907 hidspecial HID { HelpID = HID_QUERYWIZARD_BTNAGGREGATEPLUS; }; -#define HID_QUERYWIZARD_BTNAGGREGATEMINUS 40908 +// #define HID_QUERYWIZARD_BTNAGGREGATEMINUS 40908 hidspecial HID { HelpID = HID_QUERYWIZARD_BTNAGGREGATEMINUS; }; -#define HID_QUERYWIZARD_LSTFILTERFIELDS 40915 +// #define HID_QUERYWIZARD_LSTFILTERFIELDS 40915 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDS; }; -#define HID_QUERYWIZARD_CMDFILTERMOVESELECTED 40916 +// #define HID_QUERYWIZARD_CMDFILTERMOVESELECTED 40916 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERMOVESELECTED; }; -#define HID_QUERYWIZARD_CMDFILTERREMOVESELECTED 40917 +// #define HID_QUERYWIZARD_CMDFILTERREMOVESELECTED 40917 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERREMOVESELECTED; }; -#define HID_QUERYWIZARD_LSTFILTERSELFIELDS 40918 +// #define HID_QUERYWIZARD_LSTFILTERSELFIELDS 40918 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERSELFIELDS; }; -#define HID_QUERYWIZARD_CMDFILTERMOVEUP 40919 +// #define HID_QUERYWIZARD_CMDFILTERMOVEUP 40919 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERMOVEUP; }; -#define HID_QUERYWIZARD_CMDFILTERMOVEDOWN 40920 +// #define HID_QUERYWIZARD_CMDFILTERMOVEDOWN 40920 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERMOVEDOWN; }; -#define HID_QUERYWIZARD_OPTGROUPMATCHALL 40923 +// #define HID_QUERYWIZARD_OPTGROUPMATCHALL 40923 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTGROUPMATCHALL; }; -#define HID_QUERYWIZARD_OPTGROUPMATCHANY 40924 +// #define HID_QUERYWIZARD_OPTGROUPMATCHANY 40924 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTGROUPMATCHANY; }; -#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_1 40925 +// #define HID_QUERYWIZARD_LSTFILTERFIELDNAME_1 40925 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDNAME_1; }; -#define HID_QUERYWIZARD_LSTFILTEROPERATOR_1 40926 +// #define HID_QUERYWIZARD_LSTFILTEROPERATOR_1 40926 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTEROPERATOR_1; }; -#define HID_QUERYWIZARD_TXTFILTERVALUE_1 40927 +// #define HID_QUERYWIZARD_TXTFILTERVALUE_1 40927 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTFILTERVALUE_1; }; -#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_2 40928 +// #define HID_QUERYWIZARD_LSTFILTERFIELDNAME_2 40928 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDNAME_2; }; -#define HID_QUERYWIZARD_LSTFILTEROPERATOR_2 40929 +// #define HID_QUERYWIZARD_LSTFILTEROPERATOR_2 40929 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTEROPERATOR_2; }; -#define HID_QUERYWIZARD_TXTFILTERVALUE_2 40930 +// #define HID_QUERYWIZARD_TXTFILTERVALUE_2 40930 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTFILTERVALUE_2; }; -#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_3 40931 +// #define HID_QUERYWIZARD_LSTFILTERFIELDNAME_3 40931 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDNAME_3; }; -#define HID_QUERYWIZARD_LSTFILTEROPERATOR_3 40932 +// #define HID_QUERYWIZARD_LSTFILTEROPERATOR_3 40932 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTEROPERATOR_3; }; -#define HID_QUERYWIZARD_TXTFILTERVALUE_3 40933 +// #define HID_QUERYWIZARD_TXTFILTERVALUE_3 40933 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTFILTERVALUE_3; }; -#define HID_QUERYWIZARD_TXTTITLE_1 40940 +// #define HID_QUERYWIZARD_TXTTITLE_1 40940 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_1; }; -#define HID_QUERYWIZARD_TXTTITLE_2 40941 +// #define HID_QUERYWIZARD_TXTTITLE_2 40941 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_2; }; -#define HID_QUERYWIZARD_TXTTITLE_3 40942 +// #define HID_QUERYWIZARD_TXTTITLE_3 40942 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_3; }; -#define HID_QUERYWIZARD_TXTTITLE_4 40943 +// #define HID_QUERYWIZARD_TXTTITLE_4 40943 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_4; }; -#define HID_QUERYWIZARD_TXTTITLE_5 40944 +// #define HID_QUERYWIZARD_TXTTITLE_5 40944 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_5; }; -#define HID_QUERYWIZARD_TXTTITLE_6 40945 +// #define HID_QUERYWIZARD_TXTTITLE_6 40945 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_6; }; -#define HID_QUERYWIZARD_TXTTITLE_7 40946 +// #define HID_QUERYWIZARD_TXTTITLE_7 40946 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_7; }; -#define HID_QUERYWIZARD_TXTQUERYTITLE 40955 +// #define HID_QUERYWIZARD_TXTQUERYTITLE 40955 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTQUERYTITLE; }; -#define HID_QUERYWIZARD_OPTDISPLAYQUERY 40956 +// #define HID_QUERYWIZARD_OPTDISPLAYQUERY 40956 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDISPLAYQUERY; }; -#define HID_QUERYWIZARD_OPTMODIFYQUERY 40957 +// #define HID_QUERYWIZARD_OPTMODIFYQUERY 40957 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTMODIFYQUERY; }; -#define HID_QUERYWIZARD_TXTSUMMARY 40958 +// #define HID_QUERYWIZARD_TXTSUMMARY 40958 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTSUMMARY; }; -#define HID_QUERYWIZARD 40970 +// #define HID_QUERYWIZARD 40970 hidspecial HID { HelpID = HID_QUERYWIZARD; }; -#define HID_QUERYWIZARD_BACK 40972 +// #define HID_QUERYWIZARD_BACK 40972 hidspecial HID { HelpID = HID_QUERYWIZARD_BACK; }; -#define HID_QUERYWIZARD_NEXT 40973 +// #define HID_QUERYWIZARD_NEXT 40973 hidspecial HID { HelpID = HID_QUERYWIZARD_NEXT; }; -#define HID_QUERYWIZARD_CREATE 40974 +// #define HID_QUERYWIZARD_CREATE 40974 hidspecial HID { HelpID = HID_QUERYWIZARD_CREATE; }; -#define HID_QUERYWIZARD_CANCEL 40975 +// #define HID_QUERYWIZARD_CANCEL 40975 hidspecial HID { HelpID = HID_QUERYWIZARD_CANCEL; }; // ++++++++++++++++++++++++++++++++++++++ // +++ Web Wizard : Continued from 34312 // ++++++++++++++++++++++++++++++++++++++ // web wizard iconssets dialog -#define HID_IS 41000 +// #define HID_IS 41000 hidspecial HID { HelpID = HID_IS; } ; -#define HID_IS_BTN_NONE 41002 +// #define HID_IS_BTN_NONE 41002 hidspecial HID { HelpID = HID_IS_BTN_NONE; } ; -#define HID_IS_BTN_OK 41003 +// #define HID_IS_BTN_OK 41003 hidspecial HID { HelpID = HID_IS_BTN_OK; } ; -#define HID_IS_BTN_CANCEL 41004 +// #define HID_IS_BTN_CANCEL 41004 hidspecial HID { HelpID = HID_IS_BTN_CANCEL; } ; -#define HID_IS_BTN_IMG1 41005 +// #define HID_IS_BTN_IMG1 41005 hidspecial HID { HelpID = HID_IS_BTN_IMG1; } ; -#define HID_IS_BTN_IMG2 41006 +// #define HID_IS_BTN_IMG2 41006 hidspecial HID { HelpID = HID_IS_BTN_IMG2; } ; -#define HID_IS_BTN_IMG3 41007 +// #define HID_IS_BTN_IMG3 41007 hidspecial HID { HelpID = HID_IS_BTN_IMG3; } ; -#define HID_IS_BTN_IMG4 41008 +// #define HID_IS_BTN_IMG4 41008 hidspecial HID { HelpID = HID_IS_BTN_IMG4; } ; -#define HID_IS_BTN_IMG5 41009 +// #define HID_IS_BTN_IMG5 41009 hidspecial HID { HelpID = HID_IS_BTN_IMG5; } ; -#define HID_IS_BTN_IMG6 41010 +// #define HID_IS_BTN_IMG6 41010 hidspecial HID { HelpID = HID_IS_BTN_IMG6; } ; -#define HID_IS_BTN_IMG7 41011 +// #define HID_IS_BTN_IMG7 41011 hidspecial HID { HelpID = HID_IS_BTN_IMG7; } ; -#define HID_IS_BTN_IMG8 41012 +// #define HID_IS_BTN_IMG8 41012 hidspecial HID { HelpID = HID_IS_BTN_IMG8; } ; -#define HID_IS_BTN_IMG9 41013 +// #define HID_IS_BTN_IMG9 41013 hidspecial HID { HelpID = HID_IS_BTN_IMG9; } ; -#define HID_IS_BTN_IMG10 41014 +// #define HID_IS_BTN_IMG10 41014 hidspecial HID { HelpID = HID_IS_BTN_IMG10; } ; -#define HID_IS_BTN_IMG11 41015 +// #define HID_IS_BTN_IMG11 41015 hidspecial HID { HelpID = HID_IS_BTN_IMG11; } ; -#define HID_IS_BTN_IMG12 41016 +// #define HID_IS_BTN_IMG12 41016 hidspecial HID { HelpID = HID_IS_BTN_IMG12; } ; -#define HID_IS_BTN_IMG13 41017 +// #define HID_IS_BTN_IMG13 41017 hidspecial HID { HelpID = HID_IS_BTN_IMG13; } ; -#define HID_IS_BTN_IMG14 41018 +// #define HID_IS_BTN_IMG14 41018 hidspecial HID { HelpID = HID_IS_BTN_IMG14; } ; -#define HID_IS_BTN_IMG15 41019 +// #define HID_IS_BTN_IMG15 41019 hidspecial HID { HelpID = HID_IS_BTN_IMG15; } ; -#define HID_IS_BTN_IMG16 41020 +// #define HID_IS_BTN_IMG16 41020 hidspecial HID { HelpID = HID_IS_BTN_IMG16; } ; -#define HID_IS_BTN_IMG17 41021 +// #define HID_IS_BTN_IMG17 41021 hidspecial HID { HelpID = HID_IS_BTN_IMG17; } ; -#define HID_IS_BTN_IMG18 41022 +// #define HID_IS_BTN_IMG18 41022 hidspecial HID { HelpID = HID_IS_BTN_IMG18; } ; -#define HID_IS_BTN_IMG19 41023 +// #define HID_IS_BTN_IMG19 41023 hidspecial HID { HelpID = HID_IS_BTN_IMG19; } ; -#define HID_IS_BTN_IMG20 41024 +// #define HID_IS_BTN_IMG20 41024 hidspecial HID { HelpID = HID_IS_BTN_IMG20; } ; -#define HID_IS_BTN_IMG21 41025 +// #define HID_IS_BTN_IMG21 41025 hidspecial HID { HelpID = HID_IS_BTN_IMG21; } ; -#define HID_IS_BTN_IMG22 41026 +// #define HID_IS_BTN_IMG22 41026 hidspecial HID { HelpID = HID_IS_BTN_IMG22; } ; -#define HID_IS_BTN_IMG23 41027 +// #define HID_IS_BTN_IMG23 41027 hidspecial HID { HelpID = HID_IS_BTN_IMG23; } ; -#define HID_IS_BTN_IMG24 41028 +// #define HID_IS_BTN_IMG24 41028 hidspecial HID { HelpID = HID_IS_BTN_IMG24; } ; -#define HID_IS_BTN_IMG25 41029 +// #define HID_IS_BTN_IMG25 41029 hidspecial HID { HelpID = HID_IS_BTN_IMG25; } ; -#define HID_IS_BTN_IMG26 41030 +// #define HID_IS_BTN_IMG26 41030 hidspecial HID { HelpID = HID_IS_BTN_IMG26; } ; -#define HID_IS_BTN_IMG27 41031 +// #define HID_IS_BTN_IMG27 41031 hidspecial HID { HelpID = HID_IS_BTN_IMG27; } ; -#define HID_IS_BTN_IMG28 41032 +// #define HID_IS_BTN_IMG28 41032 hidspecial HID { HelpID = HID_IS_BTN_IMG28; } ; -#define HID_IS_BTN_IMG29 41033 +// #define HID_IS_BTN_IMG29 41033 hidspecial HID { HelpID = HID_IS_BTN_IMG29; } ; -#define HID_IS_BTN_IMG30 41034 +// #define HID_IS_BTN_IMG30 41034 hidspecial HID { HelpID = HID_IS_BTN_IMG30; } ; -#define HID_IS_BTN_IMG31 41035 +// #define HID_IS_BTN_IMG31 41035 hidspecial HID { HelpID = HID_IS_BTN_IMG31; } ; -#define HID_IS_BTN_IMG32 41036 +// #define HID_IS_BTN_IMG32 41036 hidspecial HID { HelpID = HID_IS_BTN_IMG32; } ; // web wizard ftp dialog -#define HID_FTP 41040 +// #define HID_FTP 41040 hidspecial HID { HelpID = HID_FTP; } ; -#define HID_FTP_SERVER 41041 +// #define HID_FTP_SERVER 41041 hidspecial HID { HelpID = HID_FTP_SERVER; } ; -#define HID_FTP_USERNAME 41042 +// #define HID_FTP_USERNAME 41042 hidspecial HID { HelpID = HID_FTP_USERNAME; } ; -#define HID_FTP_PASS 41043 +// #define HID_FTP_PASS 41043 hidspecial HID { HelpID = HID_FTP_PASS; } ; -#define HID_FTP_TEST 41044 +// #define HID_FTP_TEST 41044 hidspecial HID { HelpID = HID_FTP_TEST; } ; -#define HID_FTP_TXT_PATH 41045 +// #define HID_FTP_TXT_PATH 41045 hidspecial HID { HelpID = HID_FTP_TXT_PATH; } ; -#define HID_FTP_BTN_PATH 41046 +// #define HID_FTP_BTN_PATH 41046 hidspecial HID { HelpID = HID_FTP_BTN_PATH; } ; -#define HID_FTP_OK 41047 +// #define HID_FTP_OK 41047 hidspecial HID { HelpID = HID_FTP_OK; } ; -#define HID_FTP_CANCEL 41048 +// #define HID_FTP_CANCEL 41048 hidspecial HID { HelpID = HID_FTP_CANCEL; } ; @@ -1171,217 +1172,217 @@ hidspecial HID { HelpID = HID_FTP_CANCEL; } ; // step 0 - navibar -#define HID_AGWIZ 41051 +// #define HID_AGWIZ 41051 hidspecial HID { HelpID = HID_AGWIZ; } ; -#define HID_AGWIZ_HELP 41052 +// #define HID_AGWIZ_HELP 41052 hidspecial HID { HelpID = HID_AGWIZ_HELP; } ; -#define HID_AGWIZ_NEXT 41053 +// #define HID_AGWIZ_NEXT 41053 hidspecial HID { HelpID = HID_AGWIZ_NEXT; } ; -#define HID_AGWIZ_PREV 41054 +// #define HID_AGWIZ_PREV 41054 hidspecial HID { HelpID = HID_AGWIZ_PREV; } ; -#define HID_AGWIZ_CREATE 41055 +// #define HID_AGWIZ_CREATE 41055 hidspecial HID { HelpID = HID_AGWIZ_CREATE; } ; -#define HID_AGWIZ_CANCEL 41056 +// #define HID_AGWIZ_CANCEL 41056 hidspecial HID { HelpID = HID_AGWIZ_CANCEL; } ; //step 1 - design -#define HID_AGWIZ_1_LIST_PAGEDESIGN 41057 +// #define HID_AGWIZ_1_LIST_PAGEDESIGN 41057 hidspecial HID { HelpID = HID_AGWIZ_1_LIST_PAGEDESIGN; } ; -#define HID_AGWIZ_1_CHK_MINUTES 41058 +// #define HID_AGWIZ_1_CHK_MINUTES 41058 hidspecial HID { HelpID = HID_AGWIZ_1_CHK_MINUTES; } ; // step 2 - general attributes -#define HID_AGWIZ_2_TXT_TIME 41059 +// #define HID_AGWIZ_2_TXT_TIME 41059 hidspecial HID { HelpID = HID_AGWIZ_2_TXT_TIME; } ; -#define HID_AGWIZ_2_TXT_DATE 41060 +// #define HID_AGWIZ_2_TXT_DATE 41060 hidspecial HID { HelpID = HID_AGWIZ_2_TXT_DATE; } ; -#define HID_AGWIZ_2_TXT_TITLE 41061 +// #define HID_AGWIZ_2_TXT_TITLE 41061 hidspecial HID { HelpID = HID_AGWIZ_2_TXT_TITLE; } ; -#define HID_AGWIZ_2_TXT_LOCATION 41062 +// #define HID_AGWIZ_2_TXT_LOCATION 41062 hidspecial HID { HelpID = HID_AGWIZ_2_TXT_LOCATION; } ; // step 3 - headings -#define HID_AGWIZ_3_CHK_MEETING_TYPE 41063 +// #define HID_AGWIZ_3_CHK_MEETING_TYPE 41063 hidspecial HID { HelpID = HID_AGWIZ_3_CHK_MEETING_TYPE; } ; -#define HID_AGWIZ_3_CHK_READ 41064 +// #define HID_AGWIZ_3_CHK_READ 41064 hidspecial HID { HelpID = HID_AGWIZ_3_CHK_READ; } ; -#define HID_AGWIZ_3_CHK_BRING 41065 +// #define HID_AGWIZ_3_CHK_BRING 41065 hidspecial HID { HelpID = HID_AGWIZ_3_CHK_BRING; } ; -#define HID_AGWIZ_3_CHK_NOTES 41066 +// #define HID_AGWIZ_3_CHK_NOTES 41066 hidspecial HID { HelpID = HID_AGWIZ_3_CHK_NOTES; } ; // step 4 - names -#define HID_AGWIZ_4_CHK_CALLED_BY 41067 +// #define HID_AGWIZ_4_CHK_CALLED_BY 41067 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_CALLED_BY; } ; -#define HID_AGWIZ_4_CHK_FACILITATOR 41068 +// #define HID_AGWIZ_4_CHK_FACILITATOR 41068 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_FACILITATOR; } ; -#define HID_AGWIZ_4_CHK_NOTETAKER 41069 +// #define HID_AGWIZ_4_CHK_NOTETAKER 41069 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_NOTETAKER; } ; -#define HID_AGWIZ_4_CHK_TIMEKEEPER 41070 +// #define HID_AGWIZ_4_CHK_TIMEKEEPER 41070 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_TIMEKEEPER; } ; -#define HID_AGWIZ_4_CHK_ATTENDEES 41071 +// #define HID_AGWIZ_4_CHK_ATTENDEES 41071 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_ATTENDEES; } ; -#define HID_AGWIZ_4_CHK_OBSERVERS 41072 +// #define HID_AGWIZ_4_CHK_OBSERVERS 41072 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_OBSERVERS; } ; -#define HID_AGWIZ_4_CHK_RESOURCEPERSONS 41073 +// #define HID_AGWIZ_4_CHK_RESOURCEPERSONS 41073 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_RESOURCEPERSONS; } ; // step 5 - topics -#define HID_AGWIZ_6_TXT_TEMPLATENAME 41074 +// #define HID_AGWIZ_6_TXT_TEMPLATENAME 41074 hidspecial HID { HelpID = HID_AGWIZ_6_TXT_TEMPLATENAME; } ; -#define HID_AGWIZ_6_TXT_TEMPLATEPATH 41075 +// #define HID_AGWIZ_6_TXT_TEMPLATEPATH 41075 hidspecial HID { HelpID = HID_AGWIZ_6_TXT_TEMPLATEPATH; } ; -#define HID_AGWIZ_6_BTN_TEMPLATEPATH 41076 +// #define HID_AGWIZ_6_BTN_TEMPLATEPATH 41076 hidspecial HID { HelpID = HID_AGWIZ_6_BTN_TEMPLATEPATH; } ; // step 6 - file info -#define HID_AGWIZ_6_OPT_CREATEAGENDA 41077 +// #define HID_AGWIZ_6_OPT_CREATEAGENDA 41077 hidspecial HID { HelpID = HID_AGWIZ_6_OPT_CREATEAGENDA; } ; -#define HID_AGWIZ_6_OPT_MAKECHANGES 41078 +// #define HID_AGWIZ_6_OPT_MAKECHANGES 41078 hidspecial HID { HelpID = HID_AGWIZ_6_OPT_MAKECHANGES; } ; // - again step 5 - buttons -#define HID_AGWIZ_5_BTN_INSERT 41079 +// #define HID_AGWIZ_5_BTN_INSERT 41079 hidspecial HID { HelpID = HID_AGWIZ_5_BTN_INSERT; } ; -#define HID_AGWIZ_5_BTN_REMOVE 41080 +// #define HID_AGWIZ_5_BTN_REMOVE 41080 hidspecial HID { HelpID = HID_AGWIZ_5_BTN_REMOVE; } ; -#define HID_AGWIZ_5_BTN_UP 41081 +// #define HID_AGWIZ_5_BTN_UP 41081 hidspecial HID { HelpID = HID_AGWIZ_5_BTN_UP; } ; -#define HID_AGWIZ_5_BTN_DOWN 41082 +// #define HID_AGWIZ_5_BTN_DOWN 41082 hidspecial HID { HelpID = HID_AGWIZ_5_BTN_DOWN; } ; // again step 5 - scroll control -#define HID_AGWIZ_5_SCROLL_BAR 41083 +// #define HID_AGWIZ_5_SCROLL_BAR 41083 hidspecial HID { HelpID = HID_AGWIZ_5_SCROLL_BAR; } ; -#define HID_AGWIZ_5_TXT_TOPIC_1 41084 +// #define HID_AGWIZ_5_TXT_TOPIC_1 41084 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_1; } ; -#define HID_AGWIZ_5_TXT_RESPONSIBLE_1 41085 +// #define HID_AGWIZ_5_TXT_RESPONSIBLE_1 41085 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_1; } ; -#define HID_AGWIZ_5_TXT_MINUTES_1 41086 +// #define HID_AGWIZ_5_TXT_MINUTES_1 41086 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_1; } ; -#define HID_AGWIZ_5_TXT_TOPIC_2 41087 +// #define HID_AGWIZ_5_TXT_TOPIC_2 41087 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_2; } ; -#define HID_AGWIZ_5_TXT_RESPONSIBLE_2 41088 +// #define HID_AGWIZ_5_TXT_RESPONSIBLE_2 41088 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_2; } ; -#define HID_AGWIZ_5_TXT_MINUTES_2 41089 +// #define HID_AGWIZ_5_TXT_MINUTES_2 41089 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_2; } ; -#define HID_AGWIZ_5_TXT_TOPIC_3 41090 +// #define HID_AGWIZ_5_TXT_TOPIC_3 41090 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_3; } ; -#define HID_AGWIZ_5_TXT_RESPONSIBLE_3 41091 +// #define HID_AGWIZ_5_TXT_RESPONSIBLE_3 41091 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_3; } ; -#define HID_AGWIZ_5_TXT_MINUTES_3 41092 +// #define HID_AGWIZ_5_TXT_MINUTES_3 41092 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_3; } ; -#define HID_AGWIZ_5_TXT_TOPIC_4 41093 +// #define HID_AGWIZ_5_TXT_TOPIC_4 41093 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_4; } ; -#define HID_AGWIZ_5_TXT_RESPONSIBLE_4 41094 +// #define HID_AGWIZ_5_TXT_RESPONSIBLE_4 41094 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_4; } ; -#define HID_AGWIZ_5_TXT_MINUTES_4 41095 +// #define HID_AGWIZ_5_TXT_MINUTES_4 41095 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_4; } ; -#define HID_AGWIZ_5_TXT_TOPIC_5 41096 +// #define HID_AGWIZ_5_TXT_TOPIC_5 41096 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_5; } ; -#define HID_AGWIZ_5_TXT_RESPONSIBLE_5 41097 +// #define HID_AGWIZ_5_TXT_RESPONSIBLE_5 41097 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_5; } ; -#define HID_AGWIZ_5_TXT_MINUTES_5 41098 +// #define HID_AGWIZ_5_TXT_MINUTES_5 41098 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_5; } ; //FaxWizard--------------------------- -#define HID_FAXWIZ_OPTBUSINESSFAX 41120 +// #define HID_FAXWIZ_OPTBUSINESSFAX 41120 hidspecial HID { HelpID = HID_FAXWIZ_OPTBUSINESSFAX; }; -#define HID_FAXWIZ_LSTBUSINESSSTYLE 41121 +// #define HID_FAXWIZ_LSTBUSINESSSTYLE 41121 hidspecial HID { HelpID = HID_FAXWIZ_LSTBUSINESSSTYLE; }; -#define HID_FAXWIZ_OPTPRIVATEFAX 41122 +// #define HID_FAXWIZ_OPTPRIVATEFAX 41122 hidspecial HID { HelpID = HID_FAXWIZ_OPTPRIVATEFAX; }; -#define HID_LSTPRIVATESTYLE 41123 +// #define HID_LSTPRIVATESTYLE 41123 hidspecial HID { HelpID = HID_LSTPRIVATESTYLE; }; -#define HID_IMAGECONTROL3 41124 +// #define HID_IMAGECONTROL3 41124 hidspecial HID { HelpID = HID_IMAGECONTROL3; }; -#define HID_CHKUSELOGO 41125 +// #define HID_CHKUSELOGO 41125 hidspecial HID { HelpID = HID_CHKUSELOGO; }; -#define HID_CHKUSEDATE 41126 +// #define HID_CHKUSEDATE 41126 hidspecial HID { HelpID = HID_CHKUSEDATE; }; -#define HID_CHKUSECOMMUNICATIONTYPE 41127 +// #define HID_CHKUSECOMMUNICATIONTYPE 41127 hidspecial HID { HelpID = HID_CHKUSECOMMUNICATIONTYPE; }; -#define HID_LSTCOMMUNICATIONTYPE 41128 +// #define HID_LSTCOMMUNICATIONTYPE 41128 hidspecial HID { HelpID = HID_LSTCOMMUNICATIONTYPE; }; -#define HID_CHKUSESUBJECT 41129 +// #define HID_CHKUSESUBJECT 41129 hidspecial HID { HelpID = HID_CHKUSESUBJECT; }; -#define HID_CHKUSESALUTATION 41130 +// #define HID_CHKUSESALUTATION 41130 hidspecial HID { HelpID = HID_CHKUSESALUTATION; }; -#define HID_LSTSALUTATION 41131 +// #define HID_LSTSALUTATION 41131 hidspecial HID { HelpID = HID_LSTSALUTATION; }; -#define HID_CHKUSEGREETING 41132 +// #define HID_CHKUSEGREETING 41132 hidspecial HID { HelpID = HID_CHKUSEGREETING; }; -#define HID_LSTGREETING 41133 +// #define HID_LSTGREETING 41133 hidspecial HID { HelpID = HID_LSTGREETING; }; -#define HID_CHKUSEFOOTER 41134 +// #define HID_CHKUSEFOOTER 41134 hidspecial HID { HelpID = HID_CHKUSEFOOTER; }; -#define HID_OPTSENDERPLACEHOLDER 41135 +// #define HID_OPTSENDERPLACEHOLDER 41135 hidspecial HID { HelpID = HID_OPTSENDERPLACEHOLDER; }; -#define HID_OPTSENDERDEFINE 41136 +// #define HID_OPTSENDERDEFINE 41136 hidspecial HID { HelpID = HID_OPTSENDERDEFINE; }; -#define HID_TXTSENDERNAME 41137 +// #define HID_TXTSENDERNAME 41137 hidspecial HID { HelpID = HID_TXTSENDERNAME; }; -#define HID_TXTSENDERSTREET 41138 +// #define HID_TXTSENDERSTREET 41138 hidspecial HID { HelpID = HID_TXTSENDERSTREET; }; -#define HID_TXTSENDERPOSTCODE 41139 +// #define HID_TXTSENDERPOSTCODE 41139 hidspecial HID { HelpID = HID_TXTSENDERPOSTCODE; }; -#define HID_TXTSENDERSTATE 41140 +// #define HID_TXTSENDERSTATE 41140 hidspecial HID { HelpID = HID_TXTSENDERSTATE; }; -#define HID_TXTSENDERCITY 41141 +// #define HID_TXTSENDERCITY 41141 hidspecial HID { HelpID = HID_TXTSENDERCITY; }; -#define HID_TXTSENDERFAX 41142 +// #define HID_TXTSENDERFAX 41142 hidspecial HID { HelpID = HID_TXTSENDERFAX; }; -#define HID_OPTRECEIVERPLACEHOLDER 41143 +// #define HID_OPTRECEIVERPLACEHOLDER 41143 hidspecial HID { HelpID = HID_OPTRECEIVERPLACEHOLDER; }; -#define HID_OPTRECEIVERDATABASE 41144 +// #define HID_OPTRECEIVERDATABASE 41144 hidspecial HID { HelpID = HID_OPTRECEIVERDATABASE; }; -#define HID_TXTFOOTER 41145 +// #define HID_TXTFOOTER 41145 hidspecial HID { HelpID = HID_TXTFOOTER; }; -#define HID_CHKFOOTERNEXTPAGES 41146 +// #define HID_CHKFOOTERNEXTPAGES 41146 hidspecial HID { HelpID = HID_CHKFOOTERNEXTPAGES; }; -#define HID_CHKFOOTERPAGENUMBERS 41147 +// #define HID_CHKFOOTERPAGENUMBERS 41147 hidspecial HID { HelpID = HID_CHKFOOTERPAGENUMBERS; }; -#define HID_TXTTEMPLATENAME 41148 +// #define HID_TXTTEMPLATENAME 41148 hidspecial HID { HelpID = HID_TXTTEMPLATENAME; }; -#define HID_FILETEMPLATEPATH 41149 +// #define HID_FILETEMPLATEPATH 41149 hidspecial HID { HelpID = HID_FILETEMPLATEPATH; }; -#define HID_OPTCREATEFAX 41150 +// #define HID_OPTCREATEFAX 41150 hidspecial HID { HelpID = HID_OPTCREATEFAX; }; -#define HID_OPTMAKECHANGES 41151 +// #define HID_OPTMAKECHANGES 41151 hidspecial HID { HelpID = HID_OPTMAKECHANGES; }; -#define HID_IMAGECONTROL2 41152 +// #define HID_IMAGECONTROL2 41152 hidspecial HID { HelpID = HID_IMAGECONTROL2; }; -#define HID_FAXWIZ_TXTPATH 41153 +// #define HID_FAXWIZ_TXTPATH 41153 hidspecial HID { HelpID = HID_FAXWIZ_TXTPATH; }; -#define HID_FAXWIZ_CMDPATH 41154 +// #define HID_FAXWIZ_CMDPATH 41154 hidspecial HID { HelpID = HID_FAXWIZ_CMDPATH; }; -#define HID_FAXWIZARD 41180 +// #define HID_FAXWIZARD 41180 hidspecial HID { HelpID = HID_FAXWIZARD; }; -#define HID_FAXWIZARD_HELP 41181 +// #define HID_FAXWIZARD_HELP 41181 hidspecial HID { HelpID = HID_FAXWIZARD_HELP; }; -#define HID_FAXWIZARD_BACK 41182 +// #define HID_FAXWIZARD_BACK 41182 hidspecial HID { HelpID = HID_FAXWIZARD_BACK; }; -#define HID_FAXWIZARD_NEXT 41183 +// #define HID_FAXWIZARD_NEXT 41183 hidspecial HID { HelpID = HID_FAXWIZARD_NEXT; }; -#define HID_FAXWIZARD_CREATE 41184 +// #define HID_FAXWIZARD_CREATE 41184 hidspecial HID { HelpID = HID_FAXWIZARD_CREATE; }; -#define HID_FAXWIZARD_CANCEL 41185 +// #define HID_FAXWIZARD_CANCEL 41185 hidspecial HID { HelpID = HID_FAXWIZARD_CANCEL; }; @@ -1391,105 +1392,105 @@ hidspecial HID { HelpID = HID_FAXWIZARD_CANCEL; }; * ==================================== */ -#define HID_DLGTABLE_DIALOG 41200 +// #define HID_DLGTABLE_DIALOG 41200 hidspecial HID { HelpID = HID_DLGTABLE_DIALOG; }; -#define HID_DLGTABLE_CMDPREV 41202 +// #define HID_DLGTABLE_CMDPREV 41202 hidspecial HID { HelpID = HID_DLGTABLE_CMDPREV; }; -#define HID_DLGTABLE_CMDNEXT 41203 +// #define HID_DLGTABLE_CMDNEXT 41203 hidspecial HID { HelpID = HID_DLGTABLE_CMDNEXT; }; -#define HID_DLGTABLE_CMDFINISH 41204 +// #define HID_DLGTABLE_CMDFINISH 41204 hidspecial HID { HelpID = HID_DLGTABLE_CMDFINISH; }; -#define HID_DLGTABLE_CMDCANCEL 41205 +// #define HID_DLGTABLE_CMDCANCEL 41205 hidspecial HID { HelpID = HID_DLGTABLE_CMDCANCEL; }; -#define HID_DLGTABLE_OPTBUSINESS 41206 +// #define HID_DLGTABLE_OPTBUSINESS 41206 hidspecial HID { HelpID = HID_DLGTABLE_OPTBUSINESS; }; -#define HID_DLGTABLE_OPTPRIVATE 41207 +// #define HID_DLGTABLE_OPTPRIVATE 41207 hidspecial HID { HelpID = HID_DLGTABLE_OPTPRIVATE; }; -#define HID_DLGTABLE_LBTABLES 41208 +// #define HID_DLGTABLE_LBTABLES 41208 hidspecial HID { HelpID = HID_DLGTABLE_LBTABLES; }; -#define HID_DLGTABLE_FIELDSAVAILABLE 41209 +// #define HID_DLGTABLE_FIELDSAVAILABLE 41209 hidspecial HID { HelpID = HID_DLGTABLE_FIELDSAVAILABLE; }; -#define HID_DLGTABLE_CMDMOVESELECTED 41210 +// #define HID_DLGTABLE_CMDMOVESELECTED 41210 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVESELECTED; }; -#define HID_DLGTABLE_CMDMOVEALL 41211 +// #define HID_DLGTABLE_CMDMOVEALL 41211 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEALL; }; -#define HID_DLGTABLE_CMDREMOVESELECTED 41212 +// #define HID_DLGTABLE_CMDREMOVESELECTED 41212 hidspecial HID { HelpID = HID_DLGTABLE_CMDREMOVESELECTED; }; -#define HID_DLGTABLE_CMDREMOVEALL 41213 +// #define HID_DLGTABLE_CMDREMOVEALL 41213 hidspecial HID { HelpID = HID_DLGTABLE_CMDREMOVEALL; }; -#define HID_DLGTABLE_FIELDSSELECTED 41214 +// #define HID_DLGTABLE_FIELDSSELECTED 41214 hidspecial HID { HelpID = HID_DLGTABLE_FIELDSSELECTED; }; -#define HID_DLGTABLE_CMDMOVEUP 41215 +// #define HID_DLGTABLE_CMDMOVEUP 41215 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEUP; }; -#define HID_DLGTABLE_CMDMOVEDOWN 41216 +// #define HID_DLGTABLE_CMDMOVEDOWN 41216 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEDOWN; }; -#define HID_DLGTABLE_LB_SELFIELDNAMES 41220 +// #define HID_DLGTABLE_LB_SELFIELDNAMES 41220 hidspecial HID { HelpID = HID_DLGTABLE_LB_SELFIELDNAMES; }; -#define HID_DLGTABLE_CMDMOVEFIELDUP 41221 +// #define HID_DLGTABLE_CMDMOVEFIELDUP 41221 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEFIELDUP; }; -#define HID_DLGTABLE_CMDMOVEFIELDDOWN 41222 +// #define HID_DLGTABLE_CMDMOVEFIELDDOWN 41222 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEFIELDDOWN; }; -#define HID_DLGTABLE_CMDMINUS 41223 +// #define HID_DLGTABLE_CMDMINUS 41223 hidspecial HID { HelpID = HID_DLGTABLE_CMDMINUS; }; -#define HID_DLGTABLE_CMDPLUS 41224 +// #define HID_DLGTABLE_CMDPLUS 41224 hidspecial HID { HelpID = HID_DLGTABLE_CMDPLUS; }; -#define HID_DLGTABLE_COLNAME 41225 +// #define HID_DLGTABLE_COLNAME 41225 hidspecial HID { HelpID = HID_DLGTABLE_COLNAME; }; -#define HID_DLGTABLE_COLMODIFIER 41226 +// #define HID_DLGTABLE_COLMODIFIER 41226 hidspecial HID { HelpID = HID_DLGTABLE_COLMODIFIER; }; -#define HID_DLGTABLE_CHK_USEPRIMEKEY 41227 +// #define HID_DLGTABLE_CHK_USEPRIMEKEY 41227 hidspecial HID { HelpID = HID_DLGTABLE_CHK_USEPRIMEKEY; }; -#define HID_DLGTABLE_OPT_PK_AUTOMATIC 41228 +// #define HID_DLGTABLE_OPT_PK_AUTOMATIC 41228 hidspecial HID { HelpID = HID_DLGTABLE_OPT_PK_AUTOMATIC; }; -#define HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC 41229 +// #define HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC 41229 hidspecial HID { HelpID = HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC; }; -#define HID_DLGTABLE_OPT_PK_SINGLE 41230 +// #define HID_DLGTABLE_OPT_PK_SINGLE 41230 hidspecial HID { HelpID = HID_DLGTABLE_OPT_PK_SINGLE; }; -#define HID_DLGTABLE_LB_PK_FIELDNAME 41231 +// #define HID_DLGTABLE_LB_PK_FIELDNAME 41231 hidspecial HID { HelpID = HID_DLGTABLE_LB_PK_FIELDNAME; }; -#define HID_DLGTABLE_CK_PK_AUTOVALUE 41232 +// #define HID_DLGTABLE_CK_PK_AUTOVALUE 41232 hidspecial HID { HelpID = HID_DLGTABLE_CK_PK_AUTOVALUE; }; -#define HID_DLGTABLE_OPT_PK_SEVERAL 41233 +// #define HID_DLGTABLE_OPT_PK_SEVERAL 41233 hidspecial HID { HelpID = HID_DLGTABLE_OPT_PK_SEVERAL; }; -#define HID_DLGTABLE_FIELDS_PK_AVAILABLE 41234 +// #define HID_DLGTABLE_FIELDS_PK_AVAILABLE 41234 hidspecial HID { HelpID = HID_DLGTABLE_FIELDS_PK_AVAILABLE; }; -#define HID_DLGTABLE_CMDMOVE_PK_SELECTED 41235 +// #define HID_DLGTABLE_CMDMOVE_PK_SELECTED 41235 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVE_PK_SELECTED; }; -#define HID_DLGTABLE_CMDREMOVE_PK_SELECTED 41236 +// #define HID_DLGTABLE_CMDREMOVE_PK_SELECTED 41236 hidspecial HID { HelpID = HID_DLGTABLE_CMDREMOVE_PK_SELECTED; }; -#define HID_DLGTABLE_FIELDS_PK_SELECTED 41237 +// #define HID_DLGTABLE_FIELDS_PK_SELECTED 41237 hidspecial HID { HelpID = HID_DLGTABLE_FIELDS_PK_SELECTED; }; -#define HID_DLGTABLE_CMDMOVEUP_PK_SELECTED 41238 +// #define HID_DLGTABLE_CMDMOVEUP_PK_SELECTED 41238 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEUP_PK_SELECTED; }; -#define HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED 41239 +// #define HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED 41239 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED; }; -#define HID_DLGTABLE_TXT_NAME 41240 +// #define HID_DLGTABLE_TXT_NAME 41240 hidspecial HID { HelpID = HID_DLGTABLE_TXT_NAME; }; -#define HID_DLGTABLE_OPT_MODIFYTABLE 41241 +// #define HID_DLGTABLE_OPT_MODIFYTABLE 41241 hidspecial HID { HelpID = HID_DLGTABLE_OPT_MODIFYTABLE; }; -#define HID_DLGTABLE_OPT_WORKWITHTABLE 41242 +// #define HID_DLGTABLE_OPT_WORKWITHTABLE 41242 hidspecial HID { HelpID = HID_DLGTABLE_OPT_WORKWITHTABLE; }; -#define HID_DLGTABLE_OPT_STARTFORMWIZARD 41243 +// #define HID_DLGTABLE_OPT_STARTFORMWIZARD 41243 hidspecial HID { HelpID = HID_DLGTABLE_OPT_STARTFORMWIZARD; }; -#define HID_DLGTABLE_LST_CATALOG 41244 +// #define HID_DLGTABLE_LST_CATALOG 41244 hidspecial HID { HelpID = HID_DLGTABLE_LST_CATALOG; }; -#define HID_DLGTABLE_LST_SCHEMA 41245 +// #define HID_DLGTABLE_LST_SCHEMA 41245 hidspecial HID { HelpID = HID_DLGTABLE_LST_SCHEMA; }; diff --git a/xmlsecurity/prj/d.lst b/xmlsecurity/prj/d.lst index 270415164..94967c20a 100644 --- a/xmlsecurity/prj/d.lst +++ b/xmlsecurity/prj/d.lst @@ -8,3 +8,6 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid ..\%__SRC%\lib\libxmlsecurity.so %_DEST%\lib%_EXT%\libxmlsecurity.so ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\* ..\%__SRC%\bin\xmlsec*.res %_DEST%\bin%_EXT%\xmlsec*.res +..\%__SRC%\misc\xmlsecurity.component %_DEST%\xml%_EXT%\xmlsecurity.component +..\%__SRC%\misc\xsec_fw.component %_DEST%\xml%_EXT%\xsec_fw.component +..\%__SRC%\misc\xsec_xmlsec.component %_DEST%\xml%_EXT%\xsec_xmlsec.component diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx index 080d95a1e..3ea6eee3d 100644 --- a/xmlsecurity/source/component/registerservices.cxx +++ b/xmlsecurity/source/component/registerservices.cxx @@ -46,48 +46,6 @@ void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTyp *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - sal_Int32 nPos = 0; - // SERVICE DocumentDigitalSignatures - nPos = 0; - uno::Reference< registry::XRegistryKey > xNewKey( - reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( DocumentDigitalSignatures::GetImplementationName() ) ); - - xNewKey = xNewKey->createKey( rtl::OUString::createFromAscii( "/UNO/SERVICES" ) ); - - const uno::Sequence< rtl::OUString >& rSNL = DocumentDigitalSignatures::GetSupportedServiceNames(); - const rtl::OUString* pArray = rSNL.getConstArray(); - for ( nPos = rSNL.getLength(); nPos--; ) - xNewKey->createKey( pArray[nPos] ); - - // SERVICE CertificateContainer - nPos = 0; - uno::Reference< registry::XRegistryKey > xNewKeyCertificateContainer( - reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( CertificateContainer::impl_getStaticImplementationName() ) ); - xNewKeyCertificateContainer = xNewKeyCertificateContainer->createKey( rtl::OUString::createFromAscii( "/UNO/SERVICES" ) ); - - const uno::Sequence< rtl::OUString >& rSNLCertificateContainer = CertificateContainer::impl_getStaticSupportedServiceNames(); - const rtl::OUString* pArrayCertificateContainer = rSNLCertificateContainer.getConstArray(); - for ( nPos = rSNLCertificateContainer.getLength(); nPos--; ) - xNewKeyCertificateContainer->createKey( pArrayCertificateContainer[nPos] ); - - //----------------------------- - - return sal_True; - } - catch (registry::InvalidRegistryException &) - { - DBG_ERROR( "InvalidRegistryException!" ); - } - } - return sal_False; -} - void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/xmlsecurity/source/dialogs/certificatechooser.src b/xmlsecurity/source/dialogs/certificatechooser.src index 9fa8e5ec7..8bf6ea79f 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.src +++ b/xmlsecurity/source/dialogs/certificatechooser.src @@ -59,6 +59,7 @@ ModalDialog RID_XMLSECDLG_CERTCHOOSER }; PushButton BTN_VIEWCERT { + HelpID = "xmlsecurity:PushButton:RID_XMLSECDLG_CERTCHOOSER:BTN_VIEWCERT"; Pos = MAP_APPFONT( CS_COL_1, CS_ROW_3 ); Size = MAP_APPFONT( CS_COL_2-CS_COL_1, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "View Certificate..."; diff --git a/xmlsecurity/source/dialogs/certificateviewer.src b/xmlsecurity/source/dialogs/certificateviewer.src index 19f90de45..e0a9e5bbf 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.src +++ b/xmlsecurity/source/dialogs/certificateviewer.src @@ -212,6 +212,7 @@ TabPage RID_XMLSECTP_DETAILS }; MultiLineEdit ML_ELEMENT { + HelpID = "xmlsecurity:MultiLineEdit:RID_XMLSECTP_DETAILS:ML_ELEMENT"; Pos = MAP_APPFONT( CV_COL_0, CV_ROW_2 ); Size = MAP_APPFONT( CV_CONT_WIDTH, CV_ROW_3-CV_ROW_2 ); ReadOnly = TRUE; @@ -299,6 +300,7 @@ TabPage RID_XMLSECTP_CERTPATH }; PushButton BTN_VIEWCERT { + HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_CERTPATH:BTN_VIEWCERT"; Pos = MAP_APPFONT( CV_COL_1-(CV_COL_B-CV_COL_A), CVP_ROW_2 ); Size = MAP_APPFONT( CV_COL_B-CV_COL_A, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "View Certificate..."; @@ -311,6 +313,7 @@ TabPage RID_XMLSECTP_CERTPATH }; MultiLineEdit ML_CERTSTATUS { + HelpID = "xmlsecurity:MultiLineEdit:RID_XMLSECTP_CERTPATH:ML_CERTSTATUS"; Pos = MAP_APPFONT( CV_COL_0, CVP_ROW_4 ); Size = MAP_APPFONT( CV_CONT_WIDTH, REST_HEIGHT/3 ); ReadOnly = TRUE; diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src index fcdc60bee..b1e688adc 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src @@ -145,18 +145,21 @@ ModalDialog RID_XMLSECDLG_DIGSIG }; PushButton BTN_VIEWCERT { + HelpID = "xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_VIEWCERT"; Pos = MAP_APPFONT( 6, 142 ); Size = MAP_APPFONT( 70, 14 ); Text [ en-US ] = "View Certificate..."; }; PushButton BTN_ADDCERT { + HelpID = "xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_ADDCERT"; Pos = MAP_APPFONT( 82, 142 ); Size = MAP_APPFONT( 70, 14 ); Text [ en-US ] = "Sign Document..."; }; PushButton BTN_REMOVECERT { + HelpID = "xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_REMOVECERT"; Pos = MAP_APPFONT( 158, 142 ); Size = MAP_APPFONT( 70, 14 ); Text [ en-US ] = "Remove"; diff --git a/xmlsecurity/source/dialogs/helpids.hrc b/xmlsecurity/source/dialogs/helpids.hrc index 4b0329de3..6b6088669 100644 --- a/xmlsecurity/source/dialogs/helpids.hrc +++ b/xmlsecurity/source/dialogs/helpids.hrc @@ -34,34 +34,22 @@ // Help-Ids -------------------------------------------------------------- -#define HID_XMLSEC_TP_MACROSEC (HID_XMLSECURITY_START + 0) -#define HID_XMLSEC_TP_SECLEVEL (HID_XMLSECURITY_START + 1) -#define HID_XMLSEC_TP_TRUSTSOURCES (HID_XMLSECURITY_START + 2) -#define HID_XMLSEC_DLG_CERTVIEWER (HID_XMLSECURITY_START + 3) -#define HID_XMLSEC_TP_GENERAL (HID_XMLSECURITY_START + 4) -#define HID_XMLSEC_TP_DETAILS (HID_XMLSECURITY_START + 5) -#define HID_XMLSEC_TP_CERTPATH (HID_XMLSECURITY_START + 6) -#define HID_XMLSEC_DLG_DIGSIG (HID_XMLSECURITY_START + 7) -#define HID_XMLSEC_TP_MACROWARN (HID_XMLSECURITY_START + 8) -#define HID_XMLSEC_DLG_CERTCHOOSER (HID_XMLSECURITY_START + 9) -#define HID_XMLSEC_CTRL_TRUSTSOURCES (HID_XMLSECURITY_START + 10) -#define HID_XMLSEC_CTRL_ELEMENTS (HID_XMLSECURITY_START + 11) -#define HID_XMLSEC_CTRL_VIEWSIGNATURES (HID_XMLSECURITY_START + 12) -#define HID_XMLSEC_CTRL_SIGNATURESDLG (HID_XMLSECURITY_START + 13) -#define HID_XMLSEC_CTRL_CHOOSESIGNATURES (HID_XMLSECURITY_START + 14) -#define HID_XMLSEC_TREE_SIGNATURESDLG (HID_XMLSECURITY_START + 15) - -// pb: please update ACT_XMLSECURITY_HID_END below, thx. - -// ----------------------------------------------------------------------- -// overflow check -------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_XMLSECURITY_HID_END HID_XMLSEC_TREE_SIGNATURESDLG - -#if ACT_XMLSECURITY_HID_END > HID_XMLSECURITY_END -#error helpids overflow in #line, #file -#endif +#define HID_XMLSEC_TP_MACROSEC "XMLSECURITY_HID_XMLSEC_TP_MACROSEC" +#define HID_XMLSEC_TP_SECLEVEL "XMLSECURITY_HID_XMLSEC_TP_SECLEVEL" +#define HID_XMLSEC_TP_TRUSTSOURCES "XMLSECURITY_HID_XMLSEC_TP_TRUSTSOURCES" +#define HID_XMLSEC_DLG_CERTVIEWER "XMLSECURITY_HID_XMLSEC_DLG_CERTVIEWER" +#define HID_XMLSEC_TP_GENERAL "XMLSECURITY_HID_XMLSEC_TP_GENERAL" +#define HID_XMLSEC_TP_DETAILS "XMLSECURITY_HID_XMLSEC_TP_DETAILS" +#define HID_XMLSEC_TP_CERTPATH "XMLSECURITY_HID_XMLSEC_TP_CERTPATH" +#define HID_XMLSEC_DLG_DIGSIG "XMLSECURITY_HID_XMLSEC_DLG_DIGSIG" +#define HID_XMLSEC_TP_MACROWARN "XMLSECURITY_HID_XMLSEC_TP_MACROWARN" +#define HID_XMLSEC_DLG_CERTCHOOSER "XMLSECURITY_HID_XMLSEC_DLG_CERTCHOOSER" +#define HID_XMLSEC_CTRL_TRUSTSOURCES "XMLSECURITY_HID_XMLSEC_CTRL_TRUSTSOURCES" +#define HID_XMLSEC_CTRL_ELEMENTS "XMLSECURITY_HID_XMLSEC_CTRL_ELEMENTS" +#define HID_XMLSEC_CTRL_VIEWSIGNATURES "XMLSECURITY_HID_XMLSEC_CTRL_VIEWSIGNATURES" +#define HID_XMLSEC_CTRL_SIGNATURESDLG "XMLSECURITY_HID_XMLSEC_CTRL_SIGNATURESDLG" +#define HID_XMLSEC_CTRL_CHOOSESIGNATURES "XMLSECURITY_HID_XMLSEC_CTRL_CHOOSESIGNATURES" +#define HID_XMLSEC_TREE_SIGNATURESDLG "XMLSECURITY_HID_XMLSEC_TREE_SIGNATURESDLG" #endif // #ifndef _XMLSEC_HELPIDS_HRC diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 9df532c69..c75a5f48e 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -41,7 +41,6 @@ #include <com/sun/star/security/SerialNumberAdapter.hpp> #include <comphelper/sequence.hxx> #include <sfx2/filedlghelper.hxx> -#include <svl/pickerhelper.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/xmlsecurity/source/dialogs/macrosecurity.src b/xmlsecurity/source/dialogs/macrosecurity.src index 9e7411ef9..449c45923 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.src +++ b/xmlsecurity/source/dialogs/macrosecurity.src @@ -101,6 +101,7 @@ TabPage RID_XMLSECTP_SECLEVEL }; RadioButton RB_VERYHIGH { + HelpID = "xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_VERYHIGH"; Pos = MAP_APPFONT( SL_COL_1, SL_ROW_0 ); Size = MAP_APPFONT( SL_COL_2-SL_COL_1, RSC_BIG_RADIOBUTTON ); WordBreak = TRUE; @@ -108,6 +109,7 @@ TabPage RID_XMLSECTP_SECLEVEL }; RadioButton RB_HIGH { + HelpID = "xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_HIGH"; Pos = MAP_APPFONT( SL_COL_1, SL_ROW_1 ); Size = MAP_APPFONT( SL_COL_2-SL_COL_1, RSC_BIG_RADIOBUTTON ); WordBreak = TRUE; @@ -115,6 +117,7 @@ TabPage RID_XMLSECTP_SECLEVEL }; RadioButton RB_MEDIUM { + HelpID = "xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_MEDIUM"; Pos = MAP_APPFONT( SL_COL_1, SL_ROW_2 ); Size = MAP_APPFONT( SL_COL_2-SL_COL_1, RSC_BIG_RADIOBUTTON ); WordBreak = TRUE; @@ -122,6 +125,7 @@ TabPage RID_XMLSECTP_SECLEVEL }; RadioButton RB_LOW { + HelpID = "xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_LOW"; Pos = MAP_APPFONT( SL_COL_1, SL_ROW_3 ); Size = MAP_APPFONT( SL_COL_2-SL_COL_1, SL_ROW_4-SL_ROW_3 ); WordBreak = TRUE; @@ -161,18 +165,21 @@ TabPage RID_XMLSECTP_TRUSTSOURCES }; PushButton PB_ADD_TRUSTCERT { + HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_ADD_TRUSTCERT"; Pos = MAP_APPFONT( TS_COL_2, TS_ROW_2 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "Add..."; }; PushButton PB_VIEW_TRUSTCERT { + HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_VIEW_TRUSTCERT"; Pos = MAP_APPFONT( TS_COL_4, TS_ROW_2 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "View..."; }; PushButton PB_REMOVE_TRUSTCERT { + HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_REMOVE_TRUSTCERT"; Pos = MAP_APPFONT( TS_COL_6, TS_ROW_2 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "Remove"; @@ -197,6 +204,7 @@ TabPage RID_XMLSECTP_TRUSTSOURCES }; ListBox LB_TRUSTFILELOC { + HelpID = "xmlsecurity:ListBox:RID_XMLSECTP_TRUSTSOURCES:LB_TRUSTFILELOC"; Pos = MAP_APPFONT( TS_COL_1, TS_ROW_5 ); Size = MAP_APPFONT( TS_COL_7-TS_COL_1, TS_ROW_6-TS_ROW_5 ); SVLook = TRUE; @@ -206,12 +214,14 @@ TabPage RID_XMLSECTP_TRUSTSOURCES }; PushButton FL_ADD_TRUSTFILELOC { + HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_ADD_TRUSTFILELOC"; Pos = MAP_APPFONT( TS_COL_4, TS_ROW_7 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "Add..."; }; PushButton FL_REMOVE_TRUSTFILELOC { + HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_REMOVE_TRUSTFILELOC"; Pos = MAP_APPFONT( TS_COL_6, TS_ROW_7 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "Remove"; diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index e2f7b1413..635b8dd3c 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -149,7 +149,7 @@ namespace XmlSec */ #ifdef WNT vector< pair< OUString, OUString> > parseDN(const OUString& rRawString) - { +{ vector< pair<OUString, OUString> > retVal; bool bInEscape = false; bool bInValue = false; @@ -197,7 +197,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString) bInEscape = false; } } - else if (c == ',') + else if (c == ',' || c == '+') { //The comma separate the attribute value pairs. //If the comma is not part of a value (the value would then be enclosed in '"'), @@ -292,7 +292,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString) bInEscape = false; } } - else if (c == ',') + else if (c == ',' || c == '+') { //The comma separate the attribute value pairs. //If the comma is not part of a value (the value would then be enclosed in '"'), diff --git a/xmlsecurity/source/dialogs/warnings.src b/xmlsecurity/source/dialogs/warnings.src index 913717d3b..aa912ad5d 100644 --- a/xmlsecurity/source/dialogs/warnings.src +++ b/xmlsecurity/source/dialogs/warnings.src @@ -69,6 +69,7 @@ ModalDialog RID_XMLSECTP_MACROWARN }; PushButton PB_VIEWSIGNS { + HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_MACROWARN:PB_VIEWSIGNS"; Pos = MAP_APPFONT( MW_COL_3, MW_ROW_2 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "View Signatures..."; @@ -82,6 +83,7 @@ ModalDialog RID_XMLSECTP_MACROWARN }; CheckBox CB_ALWAYSTRUST { + HelpID = "xmlsecurity:CheckBox:RID_XMLSECTP_MACROWARN:CB_ALWAYSTRUST"; Pos = MAP_APPFONT( MW_COL_1, MW_ROW_4 ); Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "Always trust macros from this source"; @@ -93,6 +95,7 @@ ModalDialog RID_XMLSECTP_MACROWARN }; PushButton PB_ENABLE { + HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_MACROWARN:PB_ENABLE"; Pos = MAP_APPFONT( DLGS_BOTTOM_OK_X( MW_WIDTH ), DLGS_BOTTOM_BTN_Y( MW_HEIGHT ) ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "Enable Macros"; diff --git a/xmlsecurity/source/framework/xsec_framework.cxx b/xmlsecurity/source/framework/xsec_framework.cxx index 01829ebf2..d4a96e047 100644 --- a/xmlsecurity/source/framework/xsec_framework.cxx +++ b/xmlsecurity/source/framework/xsec_framework.cxx @@ -59,83 +59,6 @@ void SAL_CALL component_getImplementationEnvironment( } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( - void * /*pServiceManager*/, void * pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - //Decryptor - sal_Int32 nPos = 0; - Reference< XRegistryKey > xNewKey( - reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( DecryptorImpl_getImplementationName() ) ); - xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); - - const Sequence< OUString > & rSNL = DecryptorImpl_getSupportedServiceNames(); - const OUString * pArray = rSNL.getConstArray(); - for ( nPos = rSNL.getLength(); nPos--; ) - xNewKey->createKey( pArray[nPos] ); - - //Encryptor - xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( EncryptorImpl_getImplementationName() ); - xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); - const Sequence< OUString > & rSNL2 = EncryptorImpl_getSupportedServiceNames(); - pArray = rSNL2.getConstArray(); - for ( nPos = rSNL2.getLength(); nPos--; ) - xNewKey->createKey( pArray[nPos] ); - - //SignatureCreator - xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SignatureCreatorImpl_getImplementationName() ); - xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); - const Sequence< OUString > & rSNL3 = SignatureCreatorImpl_getSupportedServiceNames(); - pArray = rSNL3.getConstArray(); - for ( nPos = rSNL3.getLength(); nPos--; ) - xNewKey->createKey( pArray[nPos] ); - - //SignatureVerifier - xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SignatureVerifierImpl_getImplementationName() ); - xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); - const Sequence< OUString > & rSNL4 = SignatureVerifierImpl_getSupportedServiceNames(); - pArray = rSNL4.getConstArray(); - for ( nPos = rSNL4.getLength(); nPos--; ) - xNewKey->createKey( pArray[nPos] ); - - //SAXEventKeeper - xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SAXEventKeeperImpl_getImplementationName() ); - xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); - const Sequence< OUString > & rSNL5 = SAXEventKeeperImpl_getSupportedServiceNames(); - pArray = rSNL5.getConstArray(); - for ( nPos = rSNL5.getLength(); nPos--; ) - xNewKey->createKey( pArray[nPos] ); - - //XMLSignatureTemplateImpl - xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( XMLSignatureTemplateImpl::impl_getImplementationName() ); - xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); - const Sequence< OUString > & rSNL6 = XMLSignatureTemplateImpl::impl_getSupportedServiceNames(); - pArray = rSNL6.getConstArray(); - for ( nPos = rSNL6.getLength(); nPos--; ) - xNewKey->createKey( pArray[nPos] ); - - // XMLEncryptionTemplateImpl - xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( XMLEncryptionTemplateImpl::impl_getImplementationName() ); - xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); - const Sequence< OUString > & rSNL7 = XMLEncryptionTemplateImpl::impl_getSupportedServiceNames(); - pArray = rSNL7.getConstArray(); - for ( nPos = rSNL7.getLength(); nPos--; ) - xNewKey->createKey( pArray[nPos] ); - - return sal_True; - } - catch (InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - return sal_False; -} - -//================================================================================================== void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx index d4c0689e5..f5948d624 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx @@ -107,7 +107,7 @@ findTypeInDN(const OUString& rRawString, const OUString& sTypeName) bInEscape = false; } } - else if (c == ',') + else if (c == ',' || c == '+') { //The comma separate the attribute value pairs. //If the comma is not part of a value (the value would then be enclosed in '"'), diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx index 410c1a644..765c45f28 100644 --- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx +++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx @@ -94,12 +94,10 @@ extern "C" { #if defined( XMLSEC_CRYPTO_NSS ) -extern sal_Bool nss_component_writeInfo( void*, void* ); extern void* nss_component_getFactory( const sal_Char*, void*, void* ); #endif #if defined( XMLSEC_CRYPTO_MSCRYPTO ) -extern sal_Bool mscrypt_component_writeInfo( void*, void* ); extern void* mscrypt_component_getFactory( const sal_Char*, void*, void* ); #endif @@ -109,75 +107,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - -sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , void* pRegistryKey ) -{ - sal_Bool result = sal_False; - sal_Int32 i ; - OUString sKeyName ; - Reference< XRegistryKey > xNewKey ; - Sequence< OUString > seqServices ; - Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ; - - if( xKey.is() ) { - // try { - // XMLElementWrapper_XmlSecImpl - sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; - sKeyName += XMLElementWrapper_XmlSecImpl_getImplementationName() ; - sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ; - - xNewKey = xKey->createKey( sKeyName ) ; - if( xNewKey.is() ) { - seqServices = XMLElementWrapper_XmlSecImpl_getSupportedServiceNames() ; - for( i = seqServices.getLength() ; i -- ; ) - xNewKey->createKey( seqServices.getConstArray()[i] ) ; - } - - // XMLDocumentWrapper_XmlSecImpl - sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; - sKeyName += XMLDocumentWrapper_XmlSecImpl_getImplementationName() ; - sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ; - - xNewKey = xKey->createKey( sKeyName ) ; - if( xNewKey.is() ) { - seqServices = XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames() ; - for( i = seqServices.getLength() ; i -- ; ) - xNewKey->createKey( seqServices.getConstArray()[i] ) ; - } - - // SerialNumberAdapterImpl - sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; - sKeyName += SerialNumberAdapterImpl_getImplementationName() ; - sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ; - - xNewKey = xKey->createKey( sKeyName ) ; - if( xNewKey.is() ) { - seqServices = SerialNumberAdapterImpl_getSupportedServiceNames() ; - for( i = seqServices.getLength() ; i -- ; ) - xNewKey->createKey( seqServices.getConstArray()[i] ) ; - } - -#if defined( XMLSEC_CRYPTO_NSS ) - result = nss_component_writeInfo( pServiceManager, pRegistryKey ) ; - if( !result ) - return sal_False ; -#endif - -#if defined( XMLSEC_CRYPTO_MSCRYPTO ) - result = mscrypt_component_writeInfo( pServiceManager, pRegistryKey ) ; - if( !result ) - return sal_False ; -#endif - - //} catch( InvalidRegistryException & ) { - // //we should not ignore exceptions - // return sal_False ; - //} - } - - return result; -} - void* SAL_CALL component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* pRegistryKey ) { void* pRet = 0; diff --git a/xmlsecurity/test_docs/certs/end_certs/User_32_Root_11.crt b/xmlsecurity/test_docs/certs/end_certs/User_32_Root_11.crt Binary files differnew file mode 100755 index 000000000..dc28470c8 --- /dev/null +++ b/xmlsecurity/test_docs/certs/end_certs/User_32_Root_11.crt diff --git a/xmlsecurity/test_docs/certs/end_certs/User_33_Root_11.crt b/xmlsecurity/test_docs/certs/end_certs/User_33_Root_11.crt Binary files differnew file mode 100755 index 000000000..df9d81d8d --- /dev/null +++ b/xmlsecurity/test_docs/certs/end_certs/User_33_Root_11.crt diff --git a/xmlsecurity/test_docs/certs/end_certs/User_34_Root_11.crt b/xmlsecurity/test_docs/certs/end_certs/User_34_Root_11.crt Binary files differnew file mode 100755 index 000000000..018da383d --- /dev/null +++ b/xmlsecurity/test_docs/certs/end_certs/User_34_Root_11.crt diff --git a/xmlsecurity/test_docs/certs/p12/Root_11.p12 b/xmlsecurity/test_docs/certs/p12/Root_11.p12 Binary files differnew file mode 100644 index 000000000..7df592643 --- /dev/null +++ b/xmlsecurity/test_docs/certs/p12/Root_11.p12 diff --git a/xmlsecurity/test_docs/certs/p12/User_32_Root_11.p12 b/xmlsecurity/test_docs/certs/p12/User_32_Root_11.p12 Binary files differnew file mode 100644 index 000000000..17e22f7a5 --- /dev/null +++ b/xmlsecurity/test_docs/certs/p12/User_32_Root_11.p12 diff --git a/xmlsecurity/test_docs/certs/p12/User_33_Root_11.p12 b/xmlsecurity/test_docs/certs/p12/User_33_Root_11.p12 Binary files differnew file mode 100644 index 000000000..5982532a9 --- /dev/null +++ b/xmlsecurity/test_docs/certs/p12/User_33_Root_11.p12 diff --git a/xmlsecurity/test_docs/certs/p12/User_34_Root_11.p12 b/xmlsecurity/test_docs/certs/p12/User_34_Root_11.p12 Binary files differnew file mode 100644 index 000000000..4c00b21d4 --- /dev/null +++ b/xmlsecurity/test_docs/certs/p12/User_34_Root_11.p12 diff --git a/xmlsecurity/test_docs/documents/dn_multivalue_rdn.odt b/xmlsecurity/test_docs/documents/dn_multivalue_rdn.odt Binary files differnew file mode 100755 index 000000000..4d34bc0f5 --- /dev/null +++ b/xmlsecurity/test_docs/documents/dn_multivalue_rdn.odt diff --git a/xmlsecurity/test_docs/documents/dn_single_multivalue_rdn.odt b/xmlsecurity/test_docs/documents/dn_single_multivalue_rdn.odt Binary files differnew file mode 100755 index 000000000..798f25a35 --- /dev/null +++ b/xmlsecurity/test_docs/documents/dn_single_multivalue_rdn.odt diff --git a/xmlsecurity/test_docs/documents/dn_single_multivalue_rdn_with_quoting.odt b/xmlsecurity/test_docs/documents/dn_single_multivalue_rdn_with_quoting.odt Binary files differnew file mode 100755 index 000000000..591f9aa4d --- /dev/null +++ b/xmlsecurity/test_docs/documents/dn_single_multivalue_rdn_with_quoting.odt diff --git a/xmlsecurity/test_docs/test_description.odt b/xmlsecurity/test_docs/test_description.odt Binary files differindex 9c2eff18d..45bbb5b0d 100644..100755 --- a/xmlsecurity/test_docs/test_description.odt +++ b/xmlsecurity/test_docs/test_description.odt diff --git a/xmlsecurity/tools/demo/util2.cxx b/xmlsecurity/tools/demo/util2.cxx index 1b2f99981..d7ab93388 100644 --- a/xmlsecurity/tools/demo/util2.cxx +++ b/xmlsecurity/tools/demo/util2.cxx @@ -384,7 +384,7 @@ void QueryPrintSignatureDetails( const SignatureInformations& SignatureInformati { char cShowDetails; fprintf( stdout, "\nDisplay details (y/n) [y]?" ); - fflush(stdin); + fflush( stdout ); fscanf( stdin, "%c", &cShowDetails); if ( cShowDetails == 'y' ) { @@ -409,7 +409,7 @@ int QuerySelectNumber( int nMin, int nMax ) do { fprintf( stdout, "\nSelect <%d-%d>:", nMin, nMax ) ; - fflush(stdin); + fflush( stdout ); fscanf( stdin, "%d", &sel ) ; } while( ( sel < nMin ) || ( sel > nMax ) ); @@ -420,7 +420,7 @@ long QueryVerifySignature() { char answer; fprintf( stdout, "\nFound a signature - verify this one (y/n) [y]?" ); - fflush(stdin); + fflush( stdout ); fscanf( stdin, "%c", &answer); return (answer == 'n')?0:1; } diff --git a/xmlsecurity/util/exports_xsmscrypt.dxp b/xmlsecurity/util/exports_xsmscrypt.dxp index 9630d7e06..f0e1c6993 100644 --- a/xmlsecurity/util/exports_xsmscrypt.dxp +++ b/xmlsecurity/util/exports_xsmscrypt.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/xmlsecurity/util/exports_xsnss.dxp b/xmlsecurity/util/exports_xsnss.dxp index 9630d7e06..f0e1c6993 100644 --- a/xmlsecurity/util/exports_xsnss.dxp +++ b/xmlsecurity/util/exports_xsnss.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk index 6ef221c7e..75ef30c7c 100644 --- a/xmlsecurity/util/makefile.mk +++ b/xmlsecurity/util/makefile.mk @@ -172,3 +172,30 @@ DEF4NAME=$(SHL4TARGET) $(MISC)$/$(SHL3TARGET).flt: makefile.mk $(TYPE) $(SHL3TARGET).flt > $@ + +ALLTAR : \ + $(MISC)/xmlsecurity.component \ + $(MISC)/xsec_fw.component \ + $(MISC)/xsec_xmlsec.component + +.IF "$(OS)" == "WNT" +my_platform = .windows +.END + +$(MISC)/xmlsecurity.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt xmlsecurity.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL4TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt xmlsecurity.component + +$(MISC)/xsec_fw.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + xsec_fw.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt xsec_fw.component + +$(MISC)/xsec_xmlsec.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt xsec_xmlsec.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt xsec_xmlsec$(my_platform).component diff --git a/xmlsecurity/util/xmlsecurity.component b/xmlsecurity/util/xmlsecurity.component new file mode 100644 index 000000000..b0759e937 --- /dev/null +++ b/xmlsecurity/util/xmlsecurity.component @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.security.CertificateContainer"> + <service name="com.sun.star.security.CertificateContainer"/> + </implementation> + <implementation name="com.sun.star.security.DocumentDigitalSignatures"> + <service name="com.sun.star.security.DocumentDigitalSignatures"/> + </implementation> +</component> diff --git a/xmlsecurity/util/xsec_fw.component b/xmlsecurity/util/xsec_fw.component new file mode 100644 index 000000000..eb9e3962a --- /dev/null +++ b/xmlsecurity/util/xsec_fw.component @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.xml.security.framework.DecryptorImpl"> + <service name="com.sun.star.xml.crypto.sax.Decryptor"/> + </implementation> + <implementation name="com.sun.star.xml.security.framework.EncryptorImpl"> + <service name="com.sun.star.xml.crypto.sax.Encryptor"/> + </implementation> + <implementation name="com.sun.star.xml.security.framework.SAXEventKeeperImpl"> + <service name="com.sun.star.xml.crypto.sax.SAXEventKeeper"/> + </implementation> + <implementation + name="com.sun.star.xml.security.framework.SignatureCreatorImpl"> + <service name="com.sun.star.xml.crypto.sax.SignatureCreator"/> + </implementation> + <implementation + name="com.sun.star.xml.security.framework.SignatureVerifierImpl"> + <service name="com.sun.star.xml.crypto.sax.SignatureVerifier"/> + </implementation> + <implementation + name="com.sun.star.xml.security.framework.XMLEncryptionTemplateImpl"> + <service name="com.sun.star.xml.crypto.XMLEncryptionTemplate"/> + </implementation> + <implementation + name="com.sun.star.xml.security.framework.XMLSignatureTemplateImpl"> + <service name="com.sun.star.xml.crypto.XMLSignatureTemplate"/> + </implementation> +</component> diff --git a/xmlsecurity/util/xsec_fw.dxp b/xmlsecurity/util/xsec_fw.dxp index 9630d7e06..f0e1c6993 100644 --- a/xmlsecurity/util/xsec_fw.dxp +++ b/xmlsecurity/util/xsec_fw.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/xmlsecurity/util/xsec_xmlsec.component b/xmlsecurity/util/xsec_xmlsec.component new file mode 100644 index 000000000..de991899f --- /dev/null +++ b/xmlsecurity/util/xsec_xmlsec.component @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.security.SerialNumberAdapter"> + <service name="com.sun.star.security.SerialNumberAdapter"/> + </implementation> + <implementation name="com.sun.star.xml.security.bridge.xmlsec.SEInitializer_NssImpl"> + <service name="com.sun.star.xml.crypto.SEInitializer"/> + </implementation> + <implementation name="com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"> + <service name="com.sun.star.xml.crypto.SecurityEnvironment"/> + </implementation> + <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLDocumentWrapper_XmlSecImpl"> + <service name="com.sun.star.xml.wrapper.XMLDocumentWrapper"/> + </implementation> + <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl"> + <service name="com.sun.star.xml.wrapper.XMLElementWrapper"/> + </implementation> + <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl"> + <service name="com.sun.star.xml.crypto.XMLEncryption"/> + </implementation> + <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"> + <service name="com.sun.star.xml.crypto.XMLSecurityContext"/> + </implementation> + <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl"> + <service name="com.sun.star.xml.crypto.XMLSignature"/> + </implementation> +</component> diff --git a/xmlsecurity/util/xsec_xmlsec.windows.component b/xmlsecurity/util/xsec_xmlsec.windows.component new file mode 100644 index 000000000..fb11cc6e9 --- /dev/null +++ b/xmlsecurity/util/xsec_xmlsec.windows.component @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.security.SerialNumberAdapter"> + <service name="com.sun.star.security.SerialNumberAdapter"/> + </implementation> + <implementation name="com.sun.star.xml.security.bridge.xmlsec.SEInitializer_MSCryptImpl"> + <service name="com.sun.star.xml.crypto.SEInitializer"/> + </implementation> + <implementation name="com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl"> + <service name="com.sun.star.xml.crypto.SecurityEnvironment"/> + </implementation> + <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLDocumentWrapper_XmlSecImpl"> + <service name="com.sun.star.xml.wrapper.XMLDocumentWrapper"/> + </implementation> + <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl"> + <service name="com.sun.star.xml.wrapper.XMLElementWrapper"/> + </implementation> + <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl"> + <service name="com.sun.star.xml.crypto.XMLEncryption"/> + </implementation> + <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl"> + <service name="com.sun.star.xml.crypto.XMLSecurityContext"/> + </implementation> + <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl"> + <service name="com.sun.star.xml.crypto.XMLSignature"/> + </implementation> +</component> |